mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Moved FC properties out of episode model

This commit is contained in:
Mark McDowall 2013-05-01 00:33:34 -07:00
parent 17941f5b39
commit db8912e5b7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/Calendar/CalendarCollectionView.js
View File

@ -68,9 +68,14 @@ define(['app', 'Calendar/CalendarItemView'], function () {
_.each(calendarCollection.models, function(element) { _.each(calendarCollection.models, function(element) {
var episodeTitle = element.get('title'); var episodeTitle = element.get('title');
var seriesTitle = element.get('series').title; var seriesTitle = element.get('series').title;
var start = element.get('airDate');
var end = element.get('endTime');
element.set('title', seriesTitle); element.set('title', seriesTitle);
element.set('episodeTitle', episodeTitle); element.set('episodeTitle', episodeTitle);
element.set('start', start);
element.set('end', end);
element.set('allDay', false);
}); });
callback(calendarCollection.toJSON()); callback(calendarCollection.toJSON());

9
UI/Series/EpisodeModel.js
View File

@ -9,9 +9,6 @@ define(['app'], function () {
paddedEpisodeNumber: function () { paddedEpisodeNumber: function () {
return this.get('episodeNumber'); return this.get('episodeNumber');
}, },
allDay : function () {
return false;
},
day : function () { day : function () {
return Date.create(this.get('airDate')).format('{dd}'); return Date.create(this.get('airDate')).format('{dd}');
}, },
@ -27,12 +24,6 @@ define(['app'], function () {
return start.format('{h}.{mm}{tt}'); return start.format('{h}.{mm}{tt}');
}, },
start : function () {
return this.get('airDate');
},
end : function () {
return this.get('endTime');
},
statusLevel : function () { statusLevel : function () {
var status = this.get('status'); var status = this.get('status');
var currentTime = Date.create(); var currentTime = Date.create();