|
@@ -214,9 +214,7 @@ function (angular, $, _, moment) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
p.formatDate = function(date, format) {
|
|
p.formatDate = function(date, format) {
|
|
|
-
|
|
|
|
|
- date = this.checkDate(date);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ date = moment.isMoment(date) ? date : moment(date);
|
|
|
format = format || 'YYYY-MM-DD HH:mm:ss';
|
|
format = format || 'YYYY-MM-DD HH:mm:ss';
|
|
|
|
|
|
|
|
return this.timezone === 'browser' ?
|
|
return this.timezone === 'browser' ?
|
|
@@ -225,21 +223,13 @@ function (angular, $, _, moment) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
p.getRelativeTime = function(date) {
|
|
p.getRelativeTime = function(date) {
|
|
|
-
|
|
|
|
|
- date = this.checkDate(date);
|
|
|
|
|
|
|
+ date = moment.isMoment(date) ? date : moment(date);
|
|
|
|
|
|
|
|
return this.timezone === 'browser' ?
|
|
return this.timezone === 'browser' ?
|
|
|
moment(date).fromNow() :
|
|
moment(date).fromNow() :
|
|
|
moment.utc(date).fromNow();
|
|
moment.utc(date).fromNow();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- p.checkDate = function(date) {
|
|
|
|
|
- if (!moment.isMoment(date)) {
|
|
|
|
|
- date = moment(date);
|
|
|
|
|
- }
|
|
|
|
|
- return date;
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
p._updateSchema = function(old) {
|
|
p._updateSchema = function(old) {
|
|
|
var i, j, k;
|
|
var i, j, k;
|
|
|
var oldVersion = this.schemaVersion;
|
|
var oldVersion = this.schemaVersion;
|