From c81891683cc443b43653960c02c5e8b5a360f028 Mon Sep 17 00:00:00 2001 From: Dean Gardiner Date: Fri, 25 Jul 2014 17:12:42 +1200 Subject: [PATCH] [TV] Cleaner season/episode titles in list, move specials to bottom --- .../media/show/_base/static/show.episodes.js | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/couchpotato/core/media/show/_base/static/show.episodes.js b/couchpotato/core/media/show/_base/static/show.episodes.js index b49063e0..e5b99680 100755 --- a/couchpotato/core/media/show/_base/static/show.episodes.js +++ b/couchpotato/core/media/show/_base/static/show.episodes.js @@ -34,34 +34,48 @@ var Episodes = new Class({ var self = this; self.data.seasons.sort(function(a, b) { - var an = a.info.number || 0; - var bn = b.info.number || 0; + // Move "Specials" to the bottom of the list + if(!a.info.number) { + return 1; + } - if(an < bn) + if(!b.info.number) { + return -1; + } + + // Order seasons descending + if(a.info.number < b.info.number) return -1; - if(an > bn) + if(a.info.number > b.info.number) return 1; return 0; }); self.data.seasons.each(function(season) { + var title = ''; + + if(season.info.number) { + title = 'Season ' + season.info.number; + } else { + // Season 0 / Specials + title = 'Specials'; + } + season['el'] = new Element('div', { 'class': 'item head', 'id': 'season_'+season._id }).adopt( - new Element('span.name', {'text': 'Season ' + (season.info.number || 0)}) + new Element('span.name', {'text': title}) ).inject(self.episodes_container); season.episodes.sort(function(a, b) { - var an = a.info.number || 0; - var bn = b.info.number || 0; - - if(an < bn) + // Order episodes descending + if(a.info.number < b.info.number) return -1; - if(an > bn) + if(a.info.number > b.info.number) return 1; return 0; @@ -72,6 +86,8 @@ var Episodes = new Class({ if(episode.info.titles && episode.info.titles.length > 0) { title = episode.info.titles[0]; + } else { + title = 'Episode ' + episode.info.number; } episode['el'] = new Element('div', {