shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 641e01376b
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';
}