Issue 6731: Firebug.getModuleLoaderConfig is not a function

firebug · Feb 28, 2014 · 1f24f7a · 1f24f7a
1 parent 06f6896
commit 1f24f7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
@@ -30,6 +30,9 @@ Locale.registerStringBundle("chrome://firebug/locale/selectors.properties");
 Cu.import("resource://firebug/loader.js");
 Cu.import("resource://firebug/fbtrace.js");
 
+var servicesScope = {};
+Cu.import("resource://gre/modules/Services.jsm", servicesScope);
+
 const firstRunPage = "https://getfirebug.com/firstrun#Firebug ";
 
 // ********************************************************************************************* //
@@ -152,7 +155,11 @@ BrowserOverlay.prototype =
         var self = this;
         scriptSources.forEach(function(url)
         {
-            $script(self.doc, url);
+            servicesScope.Services.scriptloader.loadSubScript(url, self.doc);
+
+            // xxxHonza: This doesn't work since Firefox 28. From some reason the script
+            // isn't parsed when inserted into the second browser window. See issue 6731
+            // $script(self.doc, url);
         });
 
         // Create Firebug splitter element.

diff --git a/extension/content/firebug/moduleConfig.js b/extension/content/firebug/moduleConfig.js
@@ -1,7 +1,5 @@
 /* See license.txt for terms of usage */
 
-var Firebug = Firebug || {};
-
 // ********************************************************************************************* //
 
 /**