[Pkg-mozext-commits] [firebug] 11/82: Remove for-each (related to Issue 6158)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag fbtest-1.11.2
in repository firebug.

commit b8765a9d13058b301dbf85a2f490ff416d9493fb
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed Jan 2 18:07:18 2013 +0100

    Remove for-each (related to Issue 6158)
---
 extension/content/firebug/firefox/browserOverlay.js    |  6 +++++-
 extension/content/firebug/firefox/browserOverlayLib.js |  7 ++++---
 extension/content/firebug/net/spy.js                   |  7 +++++++
 extension/modules/firebug-service.js                   |  6 ++++--
 extension/modules/loader.js                            | 11 ++++++++---
 extension/modules/prefLoader.js                        |  3 ++-
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index 82da56a..e4eaa89 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -301,9 +301,13 @@ BrowserOverlay.prototype =
 
         var items = [];
         var currPos = Options.get("framePosition");
-        for each (var pos in ["detached", "top", "bottom", "left", "right"])
+
+        var positions = ["detached", "top", "bottom", "left", "right"];
+        for (var i=0; i<positions.length; i++)
         {
+            var pos = positions[i];
             var label = pos.charAt(0).toUpperCase() + pos.slice(1);
+
             var item = $menuitem(this.doc, {
                 label: Locale.$STR("firebug.menu." + label),
                 tooltiptext: Locale.$STR("firebug.menu.tip." + label),
diff --git a/extension/content/firebug/firefox/browserOverlayLib.js b/extension/content/firebug/firefox/browserOverlayLib.js
index e5e967e..bb04c3d 100644
--- a/extension/content/firebug/firefox/browserOverlayLib.js
+++ b/extension/content/firebug/firefox/browserOverlayLib.js
@@ -60,8 +60,8 @@ var BrowserOverlayLib =
         for (var a in attributes)
             el.setAttribute(a, attributes[a]);
 
-        for each (var a in children)
-            el.appendChild(a);
+        for (var i=0; children && i<children.length; i++)
+            el.appendChild(children[i]);
 
         if (parent)
         {
@@ -255,8 +255,9 @@ function updatePersistedValues(doc, options)
             return target.Value;
     }
 
-    for each(var attr in persist)
+    for (var i=0; i<persist.length; i++)
     {
+        var attr = persist[i];
         var val = getPersist(attr);
         if (val)
             options[attr] = val;
diff --git a/extension/content/firebug/net/spy.js b/extension/content/firebug/net/spy.js
index 7387922..e084449 100644
--- a/extension/content/firebug/net/spy.js
+++ b/extension/content/firebug/net/spy.js
@@ -1009,6 +1009,13 @@ Firebug.Spy.XHR = domplate(Firebug.Rep,
     {
         try
         {
+            if (!context.window)
+            {
+                if (FBTrace.DBG_ERRORS)
+                    FBTrace.sysout("spy.resend; ERROR no context");
+                return;
+            }
+
             // xxxHonza: must be done through Console RDP
             var win = Wrapper.unwrapObject(context.window);
             var request = new win.XMLHttpRequest();
diff --git a/extension/modules/firebug-service.js b/extension/modules/firebug-service.js
index 3ecc89f..d67eeab 100644
--- a/extension/modules/firebug-service.js
+++ b/extension/modules/firebug-service.js
@@ -844,9 +844,11 @@ var fbs =
         // make sure to unregister all the hooks
         var hookNames = ["error", "script", "breakpoint", "debugger", "debug", "interrupt", 
             "throw", "topLevel", "function", "debug"];
-        for each (var hook in hookNames)
+        for (var i=0; i<hookNames.length; i++)
         {
-            try {
+            var hook = hookNames[i];
+            try
+            {
                 jsd[hook + "Hook"] = null;
             }
             catch (exc)
diff --git a/extension/modules/loader.js b/extension/modules/loader.js
index 7b9fd9e..07e74bc 100644
--- a/extension/modules/loader.js
+++ b/extension/modules/loader.js
@@ -74,8 +74,9 @@ var FirebugLoader =
         var XPIProviderBP = Cu.import("resource://gre/modules/XPIProvider.jsm", {});
         var bootstrapScopes = XPIProviderBP.XPIProvider.bootstrapScopes;
 
-        for each(var scope in bootstrapScopes)
+        for (var id in bootstrapScopes)
         {
+            var scope = bootstrapScopes[id];
             try
             {
                 if (scope.firebugStartup)
@@ -117,9 +118,12 @@ var FirebugLoader =
         [getRoots(win.document), getRoots(win.gNavToolbox.palette),
             fbug.browserOverlay.nodesToRemove].forEach(function(list)
         {
-            for each(var el in list)
+            for (var i=0; i<list.length; i++)
+            {
+                var el = list[i];
                 if (el && el.parentNode)
                     el.parentNode.removeChild(el);
+            }
         });
 
         win.Firebug.browserOverlay.unloadContextMenuOverlay(win);
@@ -166,8 +170,9 @@ var FirebugLoader =
 
     dispatchToScopes: function(name, arguments)
     {
-        for each (var e in this.bootstrapScopes)
+        for (var id in this.bootstrapScopes)
         {
+            var e = this.bootstrapScopes[id];
             try
             {
                 if (name in e)
diff --git a/extension/modules/prefLoader.js b/extension/modules/prefLoader.js
index e40ff59..8c546d5 100644
--- a/extension/modules/prefLoader.js
+++ b/extension/modules/prefLoader.js
@@ -59,8 +59,9 @@ function clearDefaultPrefs(domain)
     var pb = Services.prefs.getDefaultBranch(domain);
 
     var names = pb.getChildList("");
-    for each (var name in names)
+    for (var i=0; i<names.length; i++)
     {
+        var name = names[i];
         if (!pb.prefHasUserValue(name))
             pb.deleteBranch(name);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git