github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sugar kills (removed sugar.js)

Browse source 
Relative dates for next airing on posters and list (series)
History time shows real time on tooltip
This commit is contained in:
Mark McDowall 2013-07-16 23:23:44 -07:00
commit 207d9c256d
21 changed files with 296 additions and 9100 deletions
Download patch file Download diff file Expand all files Collapse all files

15
UI/Calendar/CalendarView.js
View file

@ -4,10 +4,11 @@ define(
[
'app',
'marionette',
'moment',
'Calendar/Collection',
'Episode/Layout',
'fullcalendar'
], function (App, Marionette, CalendarCollection, EpisodeLayout) {
], function (App, Marionette, Moment, CalendarCollection, EpisodeLayout) {
var _instance;
@ -50,8 +51,8 @@ define(
},
getEvents: function (start, end, callback) {
var startDate = Date.create(start).format(Date.ISO8601_DATETIME);
var endDate = Date.create(end).format(Date.ISO8601_DATETIME);
var startDate = Moment(start).toISOString();
var endDate = Moment(end).toISOString();
_instance.collection.fetch({
data : { start: startDate, end: endDate },
@ -80,11 +81,11 @@ define(
getStatusLevel: function (element) {
var hasFile = element.get('hasFile');
var currentTime = Date.create();
var start = Date.create(element.get('airDate'));
var end = Date.create(element.get('end'));
var currentTime = Moment();
var start = Moment(element.get('airDate'));
var end = Moment(element.get('end'));
if (currentTime.isBetween(start, end)) {
if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
return 'warning';
}

11
UI/Calendar/UpcomingCollection.js
View file

@ -2,20 +2,21 @@
define(
[
'backbone',
'moment',
'Series/EpisodeModel'
], function (Backbone, EpisodeModel) {
], function (Backbone, Moment, EpisodeModel) {
return Backbone.Collection.extend({
url : window.ApiRoot + '/calendar',
model: EpisodeModel,
comparator: function (model1, model2) {
var airDate1 = model1.get('airDate');
var date1 = Date.create(airDate1);
var time1 = date1.getTime();
var date1 = Moment(airDate1);
var time1 = date1.unix();
var airDate2 = model2.get('airDate');
var date2 = Date.create(airDate2);
var time2 = date2.getTime();
var date2 = Moment(airDate2);
var time2 = date2.unix();
if (time1 < time2){
return -1;