Get rid of with (BrowserOverlayLib)

Author: fflorent

extension/content/firebug/firefox/browserCommands.js

@@ -1,13 +1,10 @@
 /* See license.txt for terms of usage */
 
 define([
-    "firebug/lib/trace",
     "firebug/lib/options",
-    "firebug/lib/locale",
     "firebug/firefox/browserOverlayLib",
 ],
-function(FBTrace, Options, Locale, BrowserOverlayLib) {
-with (BrowserOverlayLib) {
+function(Options, BrowserOverlayLib) {
 
 // ********************************************************************************************* //
 // Constants
@@ -21,6 +18,8 @@ var shortcuts = [
     "toggleBreakOn"
 ];
 
+var {$, $el, $command} = BrowserOverlayLib;
+
 /* Used by the browser menu, but should be really global shortcuts?
 key_increaseTextSize
 key_decreaseTextSize
@@ -167,4 +166,4 @@ var BrowserCommands =
 return BrowserCommands;
 
 // ********************************************************************************************* //
-}});
+});

extension/content/firebug/firefox/browserMenu.js

@@ -1,13 +1,14 @@
 /* See license.txt for terms of usage */
 
 define([
-    "firebug/lib/trace",
-    "firebug/lib/options",
-    "firebug/lib/locale",
     "firebug/firefox/browserOverlayLib",
 ],
-function(FBTrace, Options, Locale, BrowserOverlayLib) {
-with (BrowserOverlayLib) {
+function(BrowserOverlayLib) {
+
+// ********************************************************************************************* //
+// Constants
+
+var {$menupopupOverlay, $, $menupopup, $menu, $menuseparator, $menuitem} = BrowserOverlayLib;
 
 // ********************************************************************************************* //
 // GlobalCommands Implementation
@@ -515,4 +516,4 @@ var BrowserMenu =
 return BrowserMenu;
 
 // ********************************************************************************************* //
-}});
+});

extension/content/firebug/firefox/browserOverlay.js

@@ -16,15 +16,15 @@ define([
 function(FBTrace, Options, Locale, Arr, Str, Xpcom, BrowserOverlayLib, BrowserCommands,
     BrowserMenu, BrowserToolbar, System) {
 
-with (BrowserOverlayLib) {
-
 // ********************************************************************************************* //
 // Constants
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
+var {$, $el, $stylesheet, $menuitem} = BrowserOverlayLib;
+
 Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
 Locale.registerStringBundle("chrome://firebug/locale/cookies.properties");
 Locale.registerStringBundle("chrome://firebug/locale/selectors.properties");
@@ -182,7 +182,8 @@ BrowserOverlay.prototype =
 
             // xxxHonza: TODO find a better place for notifying extensions
             FirebugLoader.dispatchToScopes("firebugFrameLoad", [self.win.Firebug]);
-            callback && callback(self.win.Firebug);
+            if (callback)
+                callback(self.win.Firebug);
         }, false);
     },
 
@@ -316,8 +317,6 @@ BrowserOverlay.prototype =
 
     onViewMenuShowing: function()
     {
-        var suspendMarker = this.win.document.getElementById("firebugStatus");
-
         // Check whether Firebug is open
         var open = false;
         if (this.win.Firebug.chrome)
@@ -423,17 +422,17 @@ BrowserOverlay.prototype =
         sis.close();
 
         var m = /RELEASE=(.*)/.exec(content);
-        if (m)
-            var release = m[1];
-        else
+        if (!m)
             return "no RELEASE in " + versionURL;
 
+        var release = m[1];
+
         m = /VERSION=(.*)/.exec(content);
-        if (m)
-            var version = m[1];
-        else
+        if (!m)
             return "no VERSION in " + versionURL;
 
+        var version = m[1];
+
         return version+""+release;
     },
 
@@ -592,4 +591,4 @@ BrowserOverlay.prototype =
 return BrowserOverlay;
 
 // ********************************************************************************************* //
-}});
+});

extension/content/firebug/firefox/browserOverlayLib.js

@@ -294,6 +294,14 @@ function updatePersistedValues(doc, options)
 // ********************************************************************************************* //
 // Registration
 
+// Bind every method to BrowserOverlayLib.
+
+for (var method in BrowserOverlayLib)
+{
+    if (BrowserOverlayLib.hasOwnProperty(method))
+        BrowserOverlayLib[method] = BrowserOverlayLib[method].bind(BrowserOverlayLib);
+}
+
 return BrowserOverlayLib;
 
 // ********************************************************************************************* //

extension/content/firebug/firefox/browserToolbar.js

@@ -7,11 +7,12 @@ define([
     "firebug/firefox/browserOverlayLib",
 ],
 function(FBTrace, Options, Locale, BrowserOverlayLib) {
-with (BrowserOverlayLib) {
 
 // ********************************************************************************************* //
 // Constants
 
+var {$toolbarButton, $menupopupOverlay, $, $tooltip, $label, $toolbarItem, $el} = BrowserOverlayLib;
+
 // ********************************************************************************************* //
 // Firefox Toolbar Buttons
 
@@ -96,8 +97,8 @@ var BrowserToolbar =
         // TODO: merge into $toolbarButton?
         // toolbarpalette check is for seamonkey, where it is in the document
         if ((!$(doc, "firebug-badged-button") ||
-            $(doc, "firebug-badged-button").parentNode.tagName == "toolbarpalette")
-            && !Options.get("toolbarCustomizationDone"))
+            $(doc, "firebug-badged-button").parentNode.tagName == "toolbarpalette") &&
+            !Options.get("toolbarCustomizationDone"))
         {
             Options.set("toolbarCustomizationDone", true);
 
@@ -120,7 +121,7 @@ var BrowserToolbar =
                 navBar.ownerDocument.persist("nav-bar", "currentset");
 
                 // Check whether insertItem really works
-                var curSet = navBar.currentSet.split(",");
+                curSet = navBar.currentSet.split(",");
                 if (curSet.indexOf(startButtonId) == -1)
                     FBTrace.sysout("Startbutton; navBar.insertItem doesn't work", curSet);
 
@@ -155,4 +156,4 @@ var BrowserToolbar =
 return BrowserToolbar;
 
 // ********************************************************************************************* //
-}});
+});