Merge branch 'series-grid' into vnext

Conflicts:
	UI/Config.js
This commit is contained in:
Mark McDowall 2013-04-09 20:17:41 -07:00
parent d81e0885c3
commit 35e2e83595
12 changed files with 157 additions and 19 deletions

View file

@ -33,6 +33,13 @@
},
traktUrl : function () {
return "http://trakt.tv/show/" + this.get('titleSlug');
},
isContinuing : function () {
if (this.get('status') === 'Continuing'){
return true;
}
return false;
}
},