Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup moment.js deprecated zone and add functions

This commit is contained in:
Fish2 2017-11-13 19:44:04 +00:00 committed by Mark McDowall
parent 15bd181f16
commit 3492d6bbaa
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UI/Calendar/CalendarView.js
View File

@ -151,7 +151,7 @@ module.exports = Marionette.ItemView.extend({
var seriesTitle = model.get('series').title;
var start = model.get('airDateUtc');
var runtime = model.get('series').runtime;
var end = moment(start).add('minutes', runtime).toISOString();
var end = moment(start).add(runtime, 'minutes').toISOString();
var event = {
title : seriesTitle,
@ -281,4 +281,4 @@ module.exports = Marionette.ItemView.extend({
this.$('.fc-day-grid-container').css('height', '');
this.$('.fc-row.fc-widget-header').attr('style', '');
}
});
});

4
src/UI/Calendar/UpcomingItemView.js
View File

@ -13,7 +13,7 @@ module.exports = Marionette.ItemView.extend({
initialize : function() {
var start = this.model.get('airDateUtc');
var runtime = this.model.get('series').runtime;
var end = moment(start).add('minutes', runtime);
var end = moment(start).add(runtime, 'minutes');
this.model.set({
end : end.toISOString()
@ -25,4 +25,4 @@ module.exports = Marionette.ItemView.extend({
_showEpisodeDetails : function() {
vent.trigger(vent.Commands.ShowEpisodeDetails, { episode : this.model });
}
});
});

4
src/UI/Cells/RelativeDateCell.js
View File

@ -12,7 +12,7 @@ module.exports = NzbDroneCell.extend({
if (dateStr) {
var date = moment(dateStr);
var diff = date.diff(moment().zone(date.zone()).startOf('day'), 'days', true);
var diff = date.diff(moment().utcOffset(date.utcOffset()).startOf('day'), 'days', true);
var result = '<span title="{0}">{1}</span>';
var tooltip = date.format(UiSettings.longDateTime());
var text;
@ -31,4 +31,4 @@ module.exports = NzbDroneCell.extend({
}
return this;
}
});
});

2
src/UI/Commands/CommandController.js
View File

@ -20,7 +20,7 @@ var singleton = function() {
var attr = _.extend({ name : name.toLocaleLowerCase() }, properties);
var commandModel = new CommandModel(attr);
if (this._lastCommand.command && this._lastCommand.command.isSameCommand(attr) && moment().add('seconds', -5).isBefore(this._lastCommand.time)) {
if (this._lastCommand.command && this._lastCommand.command.isSameCommand(attr) && moment().add(-5, 'seconds').isBefore(this._lastCommand.time)) {
Messenger.show({
message : 'Please wait at least 5 seconds before running this command again',

6
src/UI/Series/Details/SeasonLayout.js
View File

@ -214,8 +214,8 @@ module.exports = Marionette.Layout.extend({
},
_shouldShowEpisodes : function() {
var startDate = moment().add('month', -1);
var endDate = moment().add('year', 1);
var startDate = moment().add(-1, 'month');
var endDate = moment().add(1, 'year');
return this.episodeCollection.some(function(episode) {
var airDate = episode.get('airDateUtc');
@ -298,4 +298,4 @@ module.exports = Marionette.Layout.extend({
vent.trigger(vent.Commands.OpenModalCommand, view);
}
});
});

4
src/UI/Shared/FormatHelpers.js
View File

@ -40,7 +40,7 @@ module.exports = {
return 'in ' + date.fromNow(true);
}
if (date.isBefore(moment().add('years', -1))) {
if (date.isBefore(moment().add(-1, 'years'))) {
return date.format(UiSettings.get('shortDateFormat'));
}
@ -68,4 +68,4 @@ module.exports = {
return unit + 's';
}
};
};

4
src/UI/System/Logs/Table/LogTimeCell.js
View File

@ -9,7 +9,7 @@ module.exports = NzbDroneCell.extend({
render : function() {
var dateStr = this._getValue();
var date = moment(dateStr);
var diff = date.diff(moment().zone(date.zone()).startOf('day'), 'days', true);
var diff = date.diff(moment().utcOffset(date.utcOffset()).startOf('day'), 'days', true);
var result = '<span title="{0}">{1}</span>';
var tooltip = date.format(UiSettings.longDateTime(true));
var text;
@ -28,4 +28,4 @@ module.exports = NzbDroneCell.extend({
return this;
}
});
});