Merge pull request #72 from paulhiggs/master

Fixing some of the items flagged by jshint

Author: sofia-tsa

backend/dvbi.js

@@ -111,7 +111,7 @@ window.onload = function(){
       console.log(e);
       $("#notification").show();
       if(e.error && e.error.message) {
-	 var errMessage="Error playing stream "
+	 var errMessage="Error playing stream ";
 	 if (e.error.data && e.error.data.response) {
 	    errMessage+="("+e.error.data.response.status;
 	    if (e.error.data.response.statusText.length>0)

frontend/android/js/dvbi-mobile.js

@@ -9,42 +9,42 @@ Channel.prototype.getSchedule = function(start,end,callback,earlier) {
     if(self.contentGuideURI) {
          var offset = new Date().getTimezoneOffset()*60;
          $.get( self.contentGuideURI+"?sid="+self.getServiceRef()+"&start="+(start+offset)+"&end="+(end+offset), function( data ) { //TODO use ContentGuideServiceRef from the service
-            var newPrograms = self.parseSchedule(data);
+            var j, newPrograms = self.parseSchedule(data);
             if(newPrograms.length == 0) {
-                var program = {};
+                var program0 = {};
                 var programId = "no_program_"+start+"_"+end;
-                program.start = new Date(start*1000);
-                program.end  =  new Date(end*1000);
-                program.prglen = (program.end.getTime() - program.start.getTime())/(1000*60);
-                program.title = "No programinfo available";
-                var program = new Program(program, self.element_id + "_no_program", self);
+                program0.start = new Date(start*1000);
+                program0.end  =  new Date(end*1000);
+                program0.prglen = (program0.end.getTime() - program0.start.getTime())/(1000*60);
+                program0.title = "No programinfo available";
+                var program = new Program(program0, self.element_id + "_no_program", self);
                 program.bilingual = self.bilingual;
                 program.channelimage = self.image;
                 program.channel_streamurl = self.streamurl;
                 program.noprogram = true;
                 newPrograms.push(program);
             }
             if(earlier) {
-                for(var j=newPrograms.length-1;j>= 0;j--) {
+                for(j=newPrograms.length-1;j>= 0;j--) {
 		           self.programs.unshift(newPrograms[j]);
                 }
             }
             else {
-                for(var j= 0;j < newPrograms.length;j++) {
+                for(j= 0;j < newPrograms.length;j++) {
 		           self.programs.push(newPrograms[j]);
                 }
             }
             if(typeof(callback) == "function") {
                 callback.call();
             }
          },"text").fail(function() {
-              var program = {};
+              var program0 = {};
               var programId = "no_program_"+start+"_"+end;
-              program.start = new Date(start*1000);
-              program.end  =  new Date(end*1000);
-              program.prglen = (program.end.getTime() - program.start.getTime())/(1000*60);
-              program.title = "No programinfo available";
-              var program = new Program(program, self.element_id + "_no_program", self);
+              program0.start = new Date(start*1000);
+              program0.end  =  new Date(end*1000);
+              program0.prglen = (program0.end.getTime() - program0.start.getTime())/(1000*60);
+              program0.title = "No programinfo available";
+              var program = new Program(program0, self.element_id + "_no_program", self);
               program.bilingual = self.bilingual;
               program.channelimage = self.image;
               program.channel_streamurl = self.streamurl;
@@ -238,13 +238,13 @@ Channel.prototype.getClosest = function(currentFocus){
 };
 
 Channel.prototype.getCurrentlyRunningProgram = function(){
-	var self = this;
-	for(var i = 0; i < self.visiblePrograms.length; i++){
+	var i, self = this;
+	for(i = 0; i < self.visiblePrograms.length; i++){
 		if(self.visiblePrograms[i].now()){
 			return self.visiblePrograms[i];
 		}
 	}
-	for(var i = 0; i < self.programs.length; i++){
+	for(i = 0; i < self.programs.length; i++){
 		if(self.programs[i].now()){
 			return self.programs[i];
 		}

frontend/hbbtv/epg/channel.js

@@ -459,8 +459,9 @@ GridEPG.prototype.getChannelByKeyValue = function(key, value){
 
 GridEPG.prototype.getProgramByKeyValue = function(key, value){
 	for(var j = 0; j < this.channels.length; j++){
+		var k;
 		if(this.channels[j].visiblePrograms){
-			for(var k = 0; k < this.channels[j].visiblePrograms.length; k++){
+			for(k = 0; k < this.channels[j].visiblePrograms.length; k++){
 				if(this.channels[j].visiblePrograms[k] && this.channels[j].visiblePrograms[k][key]){
 					if(this.channels[j].visiblePrograms[k][key] == value){
 						return this.channels[j].visiblePrograms[k];
@@ -469,7 +470,7 @@ GridEPG.prototype.getProgramByKeyValue = function(key, value){
 			}
 		}
 		if(this.channels[j].programs){
-			for(var k = 0; k < this.channels[j].programs.length; k++){
+			for(k = 0; k < this.channels[j].programs.length; k++){
 				if(this.channels[j].programs[k] && this.channels[j].programs[k][key]){
 					if(this.channels[j].programs[k][key] == value){
 						return this.channels[j].programs[k];
@@ -549,8 +550,8 @@ GridEPG.prototype.populateProgramDetail = function(program){
 				program_time.innerHTML = program.start_date_obj.format("H:i") + " - ";
 				program_time.innerHTML += program.end_date_obj.format("H:i");
 				if(minsLeft != null && minsLeft >= 0){
-					var timeLeftText = (minsLeft == 0) ? "Ending soon" : minsLeft + " mins remaining";
-					program_time.innerHTML += ", " + timeLeftText;
+					var timeLeftText2 = (minsLeft == 0) ? "Ending soon" : minsLeft + " mins remaining";
+					program_time.innerHTML += ", " + timeLeftText2;
 				}
 				if(title.innerHTML != program.getTitle()){
           if(program.cpsIndex) {
@@ -584,16 +585,16 @@ GridEPG.prototype.populateProgramDetail = function(program){
 			}
       program.getChannel().getProgramInfo(program.programId, function(info) {
         if(info) {
-          var longDesc = info.getLongDescription();
+          var i, longDesc = info.getLongDescription();
           if(longDesc) {
             	description_text.innerHTML = longDesc.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
           }
           if(description_text.scrollHeight > description_text.offsetHeight){
             self.autoScrollDescriptionText();
           }
+	  var extendedData = "<br/>";
           if(info.creditsItems) {
-           var extendedData = "<br/>";
-           for(var i = 0;i< info.creditsItems.length;i++) {
+           for(i = 0;i< info.creditsItems.length;i++) {
               var role = i18n.getString(creditsTypes[info.creditsItems[i].role]);
               if(role) {
                   extendedData += (role+": ");
@@ -612,7 +613,7 @@ GridEPG.prototype.populateProgramDetail = function(program){
           }
           if(info.keywords) {
              extendedData += i18n.getString("label_keywords")+":";
-             for(var i = 0;i< info.creditsItems.length;i++) {
+             for(i = 0;i< info.creditsItems.length;i++) {
                extendedData += (info.keywords[i].value+",");
              }
              extendedData = extendedData.substring(0,extendedData.length-1);

frontend/hbbtv/epg/gridepg.js

@@ -175,7 +175,8 @@ function onKey(keyCode)
 
             case VK_STOP:
                 clearVideo();
-
+                break;
+		
             case 34:
             case VK_FAST_FWD:
                 keyFastFwd();

frontend/hbbtv/epg/navigation.js

@@ -43,7 +43,7 @@ Program.prototype.getTitle = function(){
       return defaultTitle;
     }
     else {
-      return this.titles[0].text
+      return this.titles[0].text;
     }
   }
   return "";
@@ -67,7 +67,7 @@ Program.prototype.getAltTitle = function(){
       return defaultTitle;
     }
     else {
-      return this.titles[0].text
+      return this.titles[0].text;
     }
   }
   return "";
@@ -92,11 +92,11 @@ Program.prototype.getSynopsisText = function(){
       return defaultDesc;
     }
     else {
-      return this.descriptions[0].text
+      return this.descriptions[0].text;
     }
   }
   return "No description";
-}
+};
 
 Program.prototype.populate = function(){
 	var self = this;
@@ -244,5 +244,5 @@ Program.prototype.getLongDescription = function() {
     return defaultDesc;
   }
   return null;
-}
+};
 

frontend/hbbtv/epg/program.js

@@ -43,11 +43,11 @@ Channel.prototype.getNowNext = function() {
                         var following = self.epg["following"];
 
                         if(now){
-                            
+                            var now_start=null, now_end=null;
                             //   info += "<span>";
                             if(now.start && now.end){
-                                var now_start = now.start;
-                                var now_end = now.end;
+                                now_start = now.start;
+                                now_end = now.end;
                             }
 
                             if(now_start){
@@ -58,9 +58,9 @@ Channel.prototype.getNowNext = function() {
 
                                 info += defLang_title + ((defLang_title != altLang_title) ? " " + altLang_title : "");
                                 if(now.parentalRating && now.parentalRating.length > 0) {
-                                    for(var i = 0;i < now.parentalRating.length;i++) {
-                                        if(now.parentalRating[i].minimumage) {
-                                            info += "("+now.parentalRating[i].minimumage+")";
+                                    for(var i2 = 0;i2 < now.parentalRating.length;i2++) {
+                                        if(now.parentalRating[i2].minimumage) {
+                                            info += "("+now.parentalRating[i2].minimumage+")";
                                             break;
                                         }
                                     }
@@ -131,9 +131,9 @@ Channel.prototype.getNowNext = function() {
 
 							info += defLang_title + ((defLang_title != altLang_title) ? " " + altLang_title : "");
 							if(next.parentalRating && next.parentalRating.length > 0) {
-                                for(var i = 0;i < next.parentalRating.length;i++) {
-                                    if(next.parentalRating[i].minimumage) {
-                                        info += "("+next.parentalRating[i].minimumage+")";
+                                for(var i3 = 0;i3 < next.parentalRating.length;i3++) {
+                                    if(next.parentalRating[i3].minimumage) {
+                                        info += "("+next.parentalRating[i3].minimumage+")";
                                         break;
                                     }
                                 }
@@ -271,7 +271,7 @@ Channel.prototype.init = function( init_obj, element_id){
 
 Channel.prototype.languageChanged = function() {
   this.element.getElementsByClassName("menuitem_chname")[0].innerHTML =  XMLEscape(getLocalizedText(this.titles,languages.ui_language));
-}
+};
 
 Channel.prototype.update = function(epg_obj){
 		var self = this;
@@ -288,7 +288,7 @@ Channel.prototype.update = function(epg_obj){
 };
 
 Channel.prototype.setOpen = function(open, focus){
-	var channel = this;
+	var i, channel = this;
 	channel.open = open;
 	if(channel.open){
 		var box = focus;
@@ -304,7 +304,7 @@ Channel.prototype.setOpen = function(open, focus){
 				var itemsElem = channel.element.childNodes.getByClass("items")[0];
 				if(itemsElem){
 					var left = 930;
-					for(var i = 0; i < itemsElem.childNodes.length; i++){
+					for(i = 0; i < itemsElem.childNodes.length; i++){
 						if(itemsElem.childNodes[i] == box.element){
 							break;
 						}
@@ -320,7 +320,7 @@ Channel.prototype.setOpen = function(open, focus){
 		var catchups = channel.element.getSuccessorsByClass("catchup");
 		var related_videos = channel.element.getSuccessorsByClass("related_video");
         if(catchups != null){
-            for(var i = 0; i < catchups.length; i++){
+            for(i = 0; i < catchups.length; i++){
                 var desc = catchups[i].getSuccessorsByClass("boxitem_description");
                 if(desc.length > 0){
                     desc = desc[0];
@@ -334,7 +334,7 @@ Channel.prototype.setOpen = function(open, focus){
             }
         }
         if(related_videos != null){
-            for(var i = 0; i < related_videos.length; i++){
+            for(i = 0; i < related_videos.length; i++){
                 var desc = related_videos[i].getSuccessorsByClass("boxitem_description");
                 if(desc.length > 0){
                     desc = desc[0];

frontend/hbbtv/launcher/channel.js

@@ -34,10 +34,10 @@ Menu.prototype.populate = function(){
 		var program_title = document.createElement("span");
 		program_title.addClass("program_title");
 		program_title.innerHTML = defLang_title ? XMLEscape(defLang_title) : XMLEscape(altLang_title);
-		var pb_width = 0;
+		var pb_width = 0, start=null, end=null;
 		if(item.boxes[0].start && item.boxes[0].end){
-			var start = item.boxes[0].start;
-			var end = item.boxes[0].end;
+			start = item.boxes[0].start;
+			end = item.boxes[0].end;
 			pb_width = Math.floor(Math.max(0, Math.round((curTime.getTime() - start.getTime()) / 1000 / 60)) / Math.max(0, Math.round((end.getTime() - start.getTime()) / 1000 / 60)) * progressWidth);
 		}