Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Register Firebug string bundle just once + register cookie bundle sooner

  • Loading branch information...
commit e0e71af2248ca2152e3594f563b51bf58fcdb1e8 1 parent f1419db
@janodvarko janodvarko authored
View
4 extension/content/firebug/cookies/cookieModule.js
@@ -70,10 +70,6 @@ const panelName = "cookies";
// Helper array for prematurely created contexts
var contexts = new Array();
-// Extend string bundle with new strings for this extension.
-// This must be done yet before domplate definitions.
-Firebug.registerStringBundle("chrome://firebug/locale/cookies.properties");
-
// Register stylesheet in Firebug. This method is introduced in Firebug 1.6
Firebug.registerStylesheet("chrome://firebug/skin/cookies/cookies.css");
View
12 extension/content/firebug/firebug.js
@@ -75,18 +75,6 @@ var defaultFuncRep = null;
var menuItemControllers = [];
var panelTypeMap = {};
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-try
-{
- // Register default Firebug string bundle (yet before domplate templates).
- Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
-}
-catch (exc)
-{
- dump("Register default string bundle FAILS: "+exc+"\n");
-}
-
// ********************************************************************************************* //
if (window.Firebug)
View
7 extension/content/firebug/firefox/browserOverlay.js
@@ -27,9 +27,16 @@ var firebugURLs =
firstRunPage: "http://getfirebug.com/firstrun#Firebug "
};
+// ********************************************************************************************* //
+// String Bundles
+
// Register bundle yet before any Locale.$STR* API is used.
Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
+// xxxHonza: this needs to be done befor firebug/cookies modules are loaded
+// and it should be part of the cookies directory.
+Locale.registerStringBundle("chrome://firebug/locale/cookies.properties");
+
// ********************************************************************************************* //
// Overlay Helpers
Please sign in to comment.
Something went wrong with that request. Please try again.