diff --git a/script/ugc.js b/script/ugc.js index ab8d7d7..3ecc0a0 100755 --- a/script/ugc.js +++ b/script/ugc.js @@ -17,7 +17,7 @@ function Film(oSettings) { this._ban.status = true; this._ban.reason = sReason; - this.feedback('Hidding movie "'+this.name()+'". Ban reason: '+this.ban().reason); + this.feedback('Hidding movie "'+this.name()+'": '+this.ban().reason); this.anchor().addClass('banned'); } else this.error('Setting ban status with no reason'); @@ -84,7 +84,8 @@ function Film(oSettings) { var sEdito = this.edito() || ''; var iRank = 0; - if(sEdito=='Nouveau') iRank += 10000000; + if(this.ban().status) iRank -= 10000000; + else if(sEdito=='Nouveau') iRank += 10000000; else if(sEdito.slice(-7)=='semaine') iRank += 100000*parseInt(sEdito.substr(0, sEdito.indexOf('รจ'))); iRank += parseInt(this.id(), 10); return iRank; @@ -96,8 +97,7 @@ function Film(oSettings) else { //Add film to DOM - this._anchor = $('
', {'class':'film', 'id':'film_'+this.getRank()}) - .data('rank', this.getRank()) + this._anchor = $('
', {'class':'film', 'id':'film_'+this.id()}) .data('id', this.id()) .append($('', {'class':'bg', 'src':this.backgroundPoster()})) .append($('
', {'class':'poster-container'}).append($('', {'class':'poster', 'src':this.backgroundPoster()}))) @@ -227,20 +227,21 @@ function Ugc() { $Films = $('.film'); - //Sort films - $Films.sort(function(oFilm1, oFilm2){return ($(oFilm1).data('rank') < $(oFilm2).data('rank'))?1:-1;}).detach(); - //Remove movies with no screening $Films.not('.banned').each(function(iKey, hFilm){ var $Film = $(hFilm); if($Film.find('.timetable').is(':empty')) { var oFilm = self.film($Film.data('id')); - self.feedback('Hiding movie "'+oFilm.name()+'". No screening today'); - $Film.addClass('banned'); + oFilm.ban(true, 'No screening today'); } }); + //Sort films + $Films.sort(function(oFilm1, oFilm2){ + return (self.film($(oFilm1).data('id')).getRank() < self.film($(oFilm2).data('id')).getRank())?1:-1; + }).detach(); + //Add films (except bans) $Films.appendTo(this.$Main);