Bug 403621 - "fix various ArrayEnumerator implementations" [p=dao@mozilla.com (Dão Gottwald) r=Mano a1.9=schrep]

browser/components/preferences/applications.js

@@ -167,7 +167,6 @@ function ArrayEnumerator(aItems) {
 
 ArrayEnumerator.prototype = {
   _index: 0,
-  _contents: [],
 
   hasMoreElements: function() {
     return this._index < this._contents.length;

chrome/test/unit/test_bug380398.js

@@ -55,7 +55,6 @@ function ArrayEnumerator(array)
 
 ArrayEnumerator.prototype = {
   pos: 0,
-  array: null,
   
   hasMoreElements: function() {
     return this.pos < this.array.length;

chrome/test/unit/test_bug397073.js

@@ -55,7 +55,6 @@ function ArrayEnumerator(array)
 
 ArrayEnumerator.prototype = {
   pos: 0,
-  array: null,
   
   hasMoreElements: function() {
     return this.pos < this.array.length;

chrome/test/unit/test_bug399707.js

@@ -55,7 +55,6 @@ function ArrayEnumerator(array)
 
 ArrayEnumerator.prototype = {
   pos: 0,
-  array: null,
   
   hasMoreElements: function() {
     return this.pos < this.array.length;

toolkit/mozapps/downloads/content/helperApps.js

@@ -61,34 +61,33 @@ function APP_URI(aType)
   return "urn:mimetype:externalApplication:" + aType;
 }
 
-function ArrayEnumerator(aItems)
+function ArrayEnumerator(aItems) {
-{
-  this._index = 0;
-  
   if (aItems) {
-    for (var i = 0; i < aItems.length; ++i) {    
+    for (var i = 0; i < aItems.length; ++i) {
       if (!aItems[i])
-        aItems.splice(i, 1);      
+        aItems.splice(i--, 1);
     }
+    this._contents = aItems;
+  } else {
+    this._contents = [];
   }
-  
+}
-  this._contents = aItems || [];
 
-  this.push = function (aElement) 
+ArrayEnumerator.prototype = {
-  {
+  _index: 0,
+
+  hasMoreElements: function () {
+    return this._index < this._contents.length;
+  },
+
+  getNext: function () {
+    return this._contents[this._index++];
+  },
+
+  push: function (aElement) {
     if (aElement)
       this._contents.push(aElement);
-  };
+  }
-  
-  this.hasMoreElements = function ()
-  {
-    return this._index < this._contents.length;
-  };
-  
-  this.getNext = function ()
-  {
-    return this._contents[this._index++];      
-  };
 };
 
 function HelperApps()

toolkit/mozapps/extensions/src/nsExtensionManager.js.in

@@ -909,25 +909,25 @@ function findClosestLocalizedResource(aDataSource, aResource) {
  * @constructor
  */
 function ArrayEnumerator(aItems) {
-  this._index = 0;
   if (aItems) {
     for (var i = 0; i < aItems.length; ++i) {
       if (!aItems[i])
-        aItems.splice(i, 1);
+        aItems.splice(i--, 1);
     }
+    this._contents = aItems;
+  } else {
+    this._contents = [];
   }
-  this._contents = aItems;
 }
 
 ArrayEnumerator.prototype = {
   _index: 0,
-  _contents: [],
 
-  hasMoreElements: function() {
+  hasMoreElements: function () {
     return this._index < this._contents.length;
   },
 
-  getNext: function() {
+  getNext: function () {
     return this._contents[this._index++];
   }
 };
@@ -939,19 +939,19 @@ ArrayEnumerator.prototype = {
  * @constructor
  */
 function FileEnumerator(files) {
-  this._index = 0;
   if (files) {
     for (var i = 0; i < files.length; ++i) {
       if (!files[i])
-        files.splice(i, 1);
+        files.splice(i--, 1);
     }
+    this._contents = files;
+  } else {
+    this._contents = [];
   }
-  this._contents = files;
 }
 
 FileEnumerator.prototype = {
   _index: 0,
-  _contents: [],
 
   /**
    * Gets the next file in the sequence.
@@ -966,7 +966,7 @@ FileEnumerator.prototype = {
    * Stop enumerating. Nothing to do here.
    */
   close: function() {
-  },
+  }
 };
 
 /**