Fix iteration on arrays

Andrey Zaytsev · Andrey Zaytsev · commit 9a6b32988ac6 · 2016-06-16T06:32:14.000+03:00
Sometimes Array.prototype is patched, "for in" works incorrect in that case - it iterates custom
props from prototype. To fix this issue regular "for" with counter should be used instead.
diff --git a/build/ableplayer.dist.js b/build/ableplayer.dist.js
diff --git a/build/ableplayer.js b/build/ableplayer.js
diff --git a/build/ableplayer.min.js b/build/ableplayer.min.js
diff --git a/scripts/buildplayer.js b/scripts/buildplayer.js
@@ -533,7 +533,7 @@
         radioName = this.mediaId + '-' + popup + '-choice';
         if (popup === 'prefs') {
           prefCats = this.getPreferencesGroups();
-          for (j in prefCats) {
+          for (j = 0; j < prefCats.length; j++) {
             trackItem = $('<li></li>');
             prefCat = prefCats[j];
             if (prefCat === 'captions') {
@@ -582,7 +582,7 @@
           this.prefsPopup.append(trackList);
         }
         else {
-          for (j in tracks) {
+          for (j = 0; j < tracks.length; j++) {
             trackItem = $('<li></li>');
             track = tracks[j];
             radioId = this.mediaId + '-' + popup + '-' + j;
@@ -1205,7 +1205,7 @@
 
     // combine left and right controls arrays for future reference
     this.controls = [];
-    for (var sec in controlLayout) {
+    for (var sec in controlLayout) if (controlLayout.hasOwnProperty(sec)) {
       this.controls = this.controls.concat(controlLayout[sec]);
     }
 
diff --git a/scripts/caption.js b/scripts/caption.js
@@ -110,7 +110,7 @@
     else {
       cues = [];
     }
-    for (c in cues) {
+    for (c = 0; c < cues.length; c++) {
       if ((cues[c].start <= now) && (cues[c].end > now)) {
         thisCaption = c;
         break;
@@ -161,40 +161,40 @@
     var result = [];
 
     var flattenComponent = function (component) {
-      var result = [];
+      var result = [], ii;
       if (component.type === 'string') {
         result.push(component.value);
       }
       else if (component.type === 'v') {
         result.push('(' + component.value + ')');
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
       }
       else if (component.type === 'i') {
         result.push('<em>');
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
         result.push('</em>');
       }
       else if (component.type === 'b') {
         result.push('<strong>');
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
         result.push('</strong>');
       }
       else {
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
       }
       return result.join('');
-    }
+    };
 
     if (typeof cue.components !== 'undefined') {
-      for (var ii in cue.components.children) {
+      for (var ii = 0; ii < cue.components.children.length; ii++) {
         result.push(flattenComponent(cue.components.children[ii]));
       }
     }
diff --git a/scripts/chapters.js b/scripts/chapters.js
@@ -67,7 +67,7 @@
     }
     if (cues.length > 0) {
       $chaptersList = $('<ul>');
-      for (c in cues) {
+      for (c = 0; c < cues.length; c++) {
         thisChapter = c;
         $chapterItem = $('<li></li>');
         $chapterButton = $('<button>',{
@@ -150,7 +150,7 @@
     var chapters, i, thisChapterIndex, chapterLabel;
 
     chapters = this.selectedChapters.cues;
-    for (i in chapters) {
+    for (i = 0; i < chapters.length; i++) {
       if ((chapters[i].start <= now) && (chapters[i].end > now)) {
         thisChapterIndex = i;
         break;
diff --git a/scripts/control.js b/scripts/control.js
@@ -1470,25 +1470,25 @@
     var i, captions, descriptions, chapters, meta;
 
     // Captions
-    for (i in this.captions) {
+    for (i = 0; i < this.captions.length; i++) {
       if (this.captions[i].language === language) {
         captions = this.captions[i];
       }
     }
     // Chapters
-    for (i in this.chapters) {
+    for (i = 0; i < this.chapters.length; i++) {
       if (this.chapters[i].language === language) {
         chapters = this.chapters[i];
       }
     }
     // Descriptions
-    for (var i in this.descriptions) {
+    for (i = 0; i < this.descriptions.length; i++) {
       if (this.descriptions[i].language === language) {
         descriptions = this.descriptions[i];
       }
     }
     // Metadata
-    for (var i in this.meta) {
+    for (i = 0; i < this.meta.length; i++) {
       if (this.meta[i].language === language) {
         meta = this.meta[i];
       }
diff --git a/scripts/description.js b/scripts/description.js
@@ -237,12 +237,12 @@
         result.push(component.value);
       }
       else {
-        for (var ii in component.children) {
+        for (var ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponentForDescription(component.children[ii]));
         }
       }
       return result.join('');
-    }
+    };
 
     var cues;
     if (this.selectedDescriptions) {
@@ -254,7 +254,7 @@
     else {
       cues = [];
     }
-    for (d in cues) {
+    for (d = 0; d < cues.length; d++) {
       if ((cues[d].start <= now) && (cues[d].end > now)) {
         thisDescription = d;
         break;
diff --git a/scripts/dragdrop.js b/scripts/dragdrop.js
@@ -178,11 +178,11 @@
     });
 
     // add a popup menu
-    var $popup = this.createPopup(windowName);
-    var $optionList = $('<ul></ul>');
-    var radioName = this.mediaId + '-' + windowName + '-choice';
+    $popup = this.createPopup(windowName);
+    $optionList = $('<ul></ul>');
+    radioName = this.mediaId + '-' + windowName + '-choice';
 
-    var options = [];
+    options = [];
     options.push({
       'name': 'move',
       'label': this.tt.windowMove
@@ -191,17 +191,17 @@
       'name': 'resize',
       'label': this.tt.windowResize
     });
-    for (var i in options) {
-      var $optionItem = $('<li></li>');
-      var option = options[i];
-      var radioId = radioName + '-' + i;
-      var $radioButton = $('<input>',{
+    for (i = 0; i < options.length; i++) {
+      $optionItem = $('<li></li>');
+      option = options[i];
+      radioId = radioName + '-' + i;
+      $radioButton = $('<input>',{
         'type': 'radio',
         'val': option.name,
         'name': radioName,
         'id': radioId
       });
-      var $radioLabel = $('<label>',{
+      $radioLabel = $('<label>',{
         'for': radioId
       });
       $radioLabel.text(option.label);
diff --git a/scripts/initialize.js b/scripts/initialize.js
@@ -343,7 +343,7 @@
 
           // inject each of the hidden forms that will be accessed from the Preferences popup menu
           prefsGroups = thisObj.getPreferencesGroups();
-          for (i in prefsGroups) {
+          for (i = 0; i < prefsGroups.length; i++) {
             thisObj.injectPrefsForm(prefsGroups[i]);
           }
           thisObj.setupPopups();
diff --git a/scripts/metadata.js b/scripts/metadata.js
@@ -21,7 +21,7 @@
     else {
       cues = [];
     }
-    for (m in cues) {
+    for (m = 0; m < cues.length; m++) {
       if ((cues[m].start <= now) && (cues[m].end > now)) {
         thisMeta = m;
         break;
@@ -97,25 +97,25 @@
     var result = [];
 
     var flattenComponent = function (component) {
-      var result = [];
+      var result = [], ii;
       if (component.type === 'string') {
         result.push(component.value);
       }
       else if (component.type === 'v') {
         result.push('[' + component.value + ']');
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
       }
       else {
-        for (var ii in component.children) {
+        for (ii = 0; ii < component.children.length; ii++) {
           result.push(flattenComponent(component.children[ii]));
         }
       }
       return result.join('');
     }
 
-    for (var ii in cue.components.children) {
+    for (var ii = 0; ii < cue.components.children.length; ii++) {
       result.push(flattenComponent(cue.components.children[ii]));
     }
 
diff --git a/scripts/search.js b/scripts/search.js
@@ -24,7 +24,7 @@
           resultsSummaryText += 'to play the video from that point.';
           resultsSummary.html(resultsSummaryText);
           var resultsList = $('<ul>');
-          for (var i in resultsArray) {
+          for (var i = 0; i < resultsArray.length; i++) {
             var resultsItem = $('<li>',{
             });
             var itemStartTime = this.secondsToTime(resultsArray[i]['start']);
@@ -75,10 +75,10 @@
       if (captions.length > 0) {
         var results = [];
         c = 0;
-        for (i in captions) {
+        for (i = 0; i < captions.length; i++) {
           if ($.inArray(captions[i].components.children[0]['type'], ['string','i','b','u','v','c']) !== -1) {
             caption = this.flattenCueForCaption(captions[i]);
-            for (j in searchTerms) {
+            for (j = 0; j < searchTerms.length; j++) {
               if (caption.indexOf(searchTerms[j]) !== -1) {
                 results[c] = [];
                 results[c]['start'] = captions[i].start;
diff --git a/scripts/transcript.js b/scripts/transcript.js
@@ -161,7 +161,7 @@
       else if (this.chapters.length > 0) {
         // Try and match the caption language.
         if (this.transcriptLang) {
-          for (var ii in this.chapters) {
+          for (var ii = 0; ii < this.chapters.length; ii++) {
             if (this.chapters[ii].language === this.transcriptLang) {
               chapters = this.chapters[ii].cues;
             }
@@ -179,7 +179,7 @@
       else if (this.descriptions.length > 0) {
         // Try and match the caption language.
         if (this.transcriptLang) {
-          for (var ii in this.descriptions) {
+          for (var ii = 0; ii < this.descriptions.length; ii++) {
             if (this.descriptions[ii].language === this.transcriptLang) {
               descriptions = this.descriptions[ii].cues;
             }
@@ -333,7 +333,7 @@
           result.push(comp.value);
         }
         else {
-          for (var ii in comp.children) {
+          for (var ii = 0; ii < comp.children.length; ii++) {
             result = result.concat(flattenComponentForChapter(comp.children[ii]));
           }
         }
@@ -343,9 +343,9 @@
       var $chapSpan = $('<span>',{
         'class': 'able-transcript-seekpoint'
       });
-      for (var ii in chap.components.children) {
+      for (var ii = 0; ii < chap.components.children.length; ii++) {
         var results = flattenComponentForChapter(chap.components.children[ii]);
-        for (var jj in results) {
+        for (var jj = 0; jj < results.length; jj++) {
           $chapSpan.append(results[jj]);
         }
       }
@@ -374,7 +374,7 @@
           result.push(comp.value);
         }
         else {
-          for (var ii in comp.children) {
+          for (var ii = 0; ii < comp.children.length; ii++) {
             result = result.concat(flattenComponentForDescription(comp.children[ii]));
           }
         }
@@ -384,9 +384,9 @@
       var $descSpan = $('<span>',{
         'class': 'able-transcript-seekpoint'
       });
-      for (var ii in desc.components.children) {
+      for (var ii = 0; ii < desc.components.children.length; ii++) {
         var results = flattenComponentForDescription(desc.components.children[ii]);
-        for (var jj in results) {
+        for (var jj = 0; jj < results.length; jj++) {
           $descSpan.append(results[jj]);
         }
       }
@@ -453,9 +453,9 @@
           });
           $vSpan.text('(' + comp.value + ')');
           result.push($vSpan);
-          for (var ii in comp.children) {
+          for (var ii = 0; ii < comp.children.length; ii++) {
             var subResults = flattenComponentForCaption(comp.children[ii]);
-            for (var jj in subResults) {
+            for (var jj = 0; jj < subResults.length; jj++) {
               result.push(subResults[jj]);
             }
           }
@@ -467,9 +467,9 @@
           else if (comp.type === 'i') {
             var $tag = $('<em>');
           }
-          for (var ii in comp.children) {
+          for (var ii = 0; ii < comp.children.length; ii++) {
             var subResults = flattenComponentForCaption(comp.children[ii]);
-            for (var jj in subResults) {
+            for (var jj = 0; jj < subResults.length; jj++) {
               $tag.append(subResults[jj]);
             }
           }
@@ -478,16 +478,16 @@
           }
         }
         else {
-          for (var ii in comp.children) {
+          for (var ii = 0; ii < comp.children.length; ii++) {
             result = result.concat(flattenComponentForCaption(comp.children[ii]));
           }
         }
         return result;
       };
 
-      for (var ii in cap.components.children) {
+      for (var ii = 0; ii < cap.components.children.length; ii++) {
         var results = flattenComponentForCaption(cap.components.children[ii]);
-        for (var jj in results) {
+        for (var jj = 0; jj < results.length; jj++) {
           var result = results[jj];
           if (typeof result === 'string') {
             if (thisObj.lyricsMode) {
diff --git a/scripts/webvtt.js b/scripts/webvtt.js
@@ -35,7 +35,7 @@
 
   function actList(state, list) {
     var results = [];
-    for (var ii in list) {
+    for (var ii = 0; ii < list.length; ii++) {
       results.push(act(state, list[ii]));
     }
     return results;
@@ -51,7 +51,7 @@
   }
 
   function updatePosition(state, cutText) {
-    for (var ii in cutText) {
+    for (var ii = 0; ii < cutText.length; ii++) {
       if (cutText[ii] === '\n') {
         state.column = 1;
         state.line += 1;

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@`
`110`	`110`	`else {`
`111`	`111`	`cues = [];`
`112`	`112`	`}`
`113`		`- for (c in cues) {`
	`113`	`+ for (c = 0; c < cues.length; c++) {`
`114`	`114`	`if ((cues[c].start <= now) && (cues[c].end > now)) {`
`115`	`115`	`thisCaption = c;`
`116`	`116`	`break;`
`@@ -161,40 +161,40 @@`
`161`	`161`	`var result = [];`
`162`	`162`
`163`	`163`	`var flattenComponent = function (component) {`
`164`		`- var result = [];`
	`164`	`+ var result = [], ii;`
`165`	`165`	`if (component.type === 'string') {`
`166`	`166`	`result.push(component.value);`
`167`	`167`	`}`
`168`	`168`	`else if (component.type === 'v') {`
`169`	`169`	`result.push('(' + component.value + ')');`
`170`		`- for (var ii in component.children) {`
	`170`	`+ for (ii = 0; ii < component.children.length; ii++) {`
`171`	`171`	`result.push(flattenComponent(component.children[ii]));`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`else if (component.type === 'i') {`
`175`	`175`	`result.push('<em>');`
`176`		`- for (var ii in component.children) {`
	`176`	`+ for (ii = 0; ii < component.children.length; ii++) {`
`177`	`177`	`result.push(flattenComponent(component.children[ii]));`
`178`	`178`	`}`
`179`	`179`	`result.push('</em>');`
`180`	`180`	`}`
`181`	`181`	`else if (component.type === 'b') {`
`182`	`182`	`result.push('<strong>');`
`183`		`- for (var ii in component.children) {`
	`183`	`+ for (ii = 0; ii < component.children.length; ii++) {`
`184`	`184`	`result.push(flattenComponent(component.children[ii]));`
`185`	`185`	`}`
`186`	`186`	`result.push('</strong>');`
`187`	`187`	`}`
`188`	`188`	`else {`
`189`		`- for (var ii in component.children) {`
	`189`	`+ for (ii = 0; ii < component.children.length; ii++) {`
`190`	`190`	`result.push(flattenComponent(component.children[ii]));`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`	`return result.join('');`
`194`		`- }`
	`194`	`+ };`
`195`	`195`
`196`	`196`	`if (typeof cue.components !== 'undefined') {`
`197`		`- for (var ii in cue.components.children) {`
	`197`	`+ for (var ii = 0; ii < cue.components.children.length; ii++) {`
`198`	`198`	`result.push(flattenComponent(cue.components.children[ii]));`
`199`	`199`	`}`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1470,25 +1470,25 @@`
`1470`	`1470`	`var i, captions, descriptions, chapters, meta;`
`1471`	`1471`
`1472`	`1472`	`// Captions`
`1473`		`- for (i in this.captions) {`
	`1473`	`+ for (i = 0; i < this.captions.length; i++) {`
`1474`	`1474`	`if (this.captions[i].language === language) {`
`1475`	`1475`	`captions = this.captions[i];`
`1476`	`1476`	`}`
`1477`	`1477`	`}`
`1478`	`1478`	`// Chapters`
`1479`		`- for (i in this.chapters) {`
	`1479`	`+ for (i = 0; i < this.chapters.length; i++) {`
`1480`	`1480`	`if (this.chapters[i].language === language) {`
`1481`	`1481`	`chapters = this.chapters[i];`
`1482`	`1482`	`}`
`1483`	`1483`	`}`
`1484`	`1484`	`// Descriptions`
`1485`		`- for (var i in this.descriptions) {`
	`1485`	`+ for (i = 0; i < this.descriptions.length; i++) {`
`1486`	`1486`	`if (this.descriptions[i].language === language) {`
`1487`	`1487`	`descriptions = this.descriptions[i];`
`1488`	`1488`	`}`
`1489`	`1489`	`}`
`1490`	`1490`	`// Metadata`
`1491`		`- for (var i in this.meta) {`
	`1491`	`+ for (i = 0; i < this.meta.length; i++) {`
`1492`	`1492`	`if (this.meta[i].language === language) {`
`1493`	`1493`	`meta = this.meta[i];`
`1494`	`1494`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,12 +237,12 @@`
`237`	`237`	`result.push(component.value);`
`238`	`238`	`}`
`239`	`239`	`else {`
`240`		`- for (var ii in component.children) {`
	`240`	`+ for (var ii = 0; ii < component.children.length; ii++) {`
`241`	`241`	`result.push(flattenComponentForDescription(component.children[ii]));`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`	`return result.join('');`
`245`		`- }`
	`245`	`+ };`
`246`	`246`
`247`	`247`	`var cues;`
`248`	`248`	`if (this.selectedDescriptions) {`
`@@ -254,7 +254,7 @@`
`254`	`254`	`else {`
`255`	`255`	`cues = [];`
`256`	`256`	`}`
`257`		`- for (d in cues) {`
	`257`	`+ for (d = 0; d < cues.length; d++) {`
`258`	`258`	`if ((cues[d].start <= now) && (cues[d].end > now)) {`
`259`	`259`	`thisDescription = d;`
`260`	`260`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@`
`343`	`343`
`344`	`344`	`// inject each of the hidden forms that will be accessed from the Preferences popup menu`
`345`	`345`	`prefsGroups = thisObj.getPreferencesGroups();`
`346`		`- for (i in prefsGroups) {`
	`346`	`+ for (i = 0; i < prefsGroups.length; i++) {`
`347`	`347`	`thisObj.injectPrefsForm(prefsGroups[i]);`
`348`	`348`	`}`
`349`	`349`	`thisObj.setupPopups();`