espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deprecated moment usage

Browse Source
This commit is contained in:
yuri
2016-04-13 16:22:41 +03:00
parent 66fdd40659
commit 52382bb958
3 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/modules/crm/lib/vis.min.js
Vendored
+17 -23
View File
File diff suppressed because one or more lines are too long
client/modules/crm/src/views/calendar/calendar.js
+4 -4
View File
@@ -251,7 +251,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
if (event.end && event.start) {
event.duration = event.end.unix() - event.start.unix();
if (event.duration < 1800) {
event.end = event.start.clone().add('m', 30);
event.end = event.start.clone().add(30, 'm');
}
}
@@ -314,7 +314,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
event.allDay = true;
if (!notInitial) {
if (event.end.hours() != 0 || event.end.minutes() != 0) {
event.end.add('days', 1);
event.end.add(1, 'days');
}
}
} else {
@@ -466,7 +466,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
var dateEnd = null;
if (event.duration) {
dateEnd = this.convertTime(event.start.clone().add('s', event.duration)) || null;
dateEnd = this.convertTime(event.start.clone().add(event.duration, 's')) || null;
}
var attributes = {};
@@ -492,7 +492,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi
if (!event.end) {
if (!~this.allDayScopeList.indexOf(event.scope)) {
event.end = event.start.clone().add('s', event.duration);
event.end = event.start.clone().add(event.duration, 's');
}
}
client/modules/crm/src/views/calendar/timeline.js
+5 -5
View File
@@ -331,7 +331,7 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
event.type = 'box';
if (event.end) {
if (o.dateEndDate) {
event.start = event.end.clone().add('days', 1);
event.start = event.end.clone().add(1, 'days');
} else {
event.start = event.end.clone();
}
@@ -582,7 +582,7 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
},
triggerView: function () {
var m = this.start.clone().add('seconds', Math.round((this.end.unix() - this.start.unix()) / 2));
var m = this.start.clone().add(Math.round((this.end.unix() - this.start.unix()) / 2), 'seconds');
this.trigger('view', m.format(this.getDateTime().internalDateFormat), this.mode);
},
@@ -702,7 +702,7 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
this.start = moment.tz(this.getDateTime().timeZone);
}
this.end = this.start.clone();
this.end.add('day', 1);
this.end.add(1, 'day');
this.fetchedStart = null;
this.fetchedEnd = null;
@@ -740,8 +740,8 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
fetchEvents: function (from, to, callback) {
Espo.Ui.notify(this.translate('Loading...'));
from = from.clone().add('seconds', (-1) * this.leftMargin);
to = to.clone().add('seconds', this.rightMargin);
from = from.clone().add((-1) * this.leftMargin, 'seconds');
to = to.clone().add(this.rightMargin, 'seconds');
var fromString = from.utc().format(this.getDateTime().internalDateTimeFormat);
var toString = to.utc().format(this.getDateTime().internalDateTimeFormat);