From ff07cebdbf9ae30ffb318647f6448488a5380ca8 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Tue, 19 Nov 2013 09:15:46 -0500 Subject: [PATCH] Bug 939122 - Move styleinspector.properties in /toolkit. r=miker --- browser/devtools/styleinspector/computed-view.js | 2 +- browser/devtools/styleinspector/rule-view.js | 2 +- browser/devtools/styleinspector/style-inspector.js | 2 +- .../test/browser_bug722196_property_view_media_queries.js | 2 +- .../test/browser_bug722196_rule_view_media_queries.js | 2 +- browser/locales/jar.mn | 1 - toolkit/devtools/styleinspector/css-logic.js | 2 +- .../en-US/chrome/global}/devtools/styleinspector.properties | 0 toolkit/locales/jar.mn | 1 + 9 files changed, 7 insertions(+), 7 deletions(-) rename {browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/global}/devtools/styleinspector.properties (100%) diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js index 648c1d1382c..d619d02205f 100644 --- a/browser/devtools/styleinspector/computed-view.js +++ b/browser/devtools/styleinspector/computed-view.js @@ -229,7 +229,7 @@ CssHtmlTree.processTemplate = function CssHtmlTree_processTemplate(aTemplate, }; XPCOMUtils.defineLazyGetter(CssHtmlTree, "_strings", function() Services.strings - .createBundle("chrome://browser/locale/devtools/styleinspector.properties")); + .createBundle("chrome://global/locale/devtools/styleinspector.properties")); XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() { return Cc["@mozilla.org/widget/clipboardhelper;1"]. diff --git a/browser/devtools/styleinspector/rule-view.js b/browser/devtools/styleinspector/rule-view.js index 73e024d76a2..09d677d2530 100644 --- a/browser/devtools/styleinspector/rule-view.js +++ b/browser/devtools/styleinspector/rule-view.js @@ -2446,7 +2446,7 @@ XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() { XPCOMUtils.defineLazyGetter(this, "_strings", function() { return Services.strings.createBundle( - "chrome://browser/locale/devtools/styleinspector.properties"); + "chrome://global/locale/devtools/styleinspector.properties"); }); XPCOMUtils.defineLazyGetter(this, "domUtils", function() { diff --git a/browser/devtools/styleinspector/style-inspector.js b/browser/devtools/styleinspector/style-inspector.js index 99bb7fd8330..9b91c1fe712 100644 --- a/browser/devtools/styleinspector/style-inspector.js +++ b/browser/devtools/styleinspector/style-inspector.js @@ -14,7 +14,7 @@ loader.lazyGetter(this, "gDevTools", () => Cu.import("resource:///modules/devtoo loader.lazyGetter(this, "RuleView", () => require("devtools/styleinspector/rule-view")); loader.lazyGetter(this, "ComputedView", () => require("devtools/styleinspector/computed-view")); loader.lazyGetter(this, "_strings", () => Services.strings - .createBundle("chrome://browser/locale/devtools/styleinspector.properties")); + .createBundle("chrome://global/locale/devtools/styleinspector.properties")); // This module doesn't currently export any symbols directly, it only // registers inspector tools. diff --git a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js index 186d8ad6dc7..96b1a96879b 100644 --- a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js +++ b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js @@ -47,7 +47,7 @@ function checkCssLogic() cssLogic.processMatchedSelectors(); let _strings = Services.strings - .createBundle("chrome://browser/locale/devtools/styleinspector.properties"); + .createBundle("chrome://global/locale/devtools/styleinspector.properties"); let inline = _strings.GetStringFromName("rule.sourceInline"); diff --git a/browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js b/browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js index b203320898d..fc8b5e4ec65 100644 --- a/browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js +++ b/browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js @@ -41,7 +41,7 @@ function checkSheets() let elementStyle = ruleView()._elementStyle; let _strings = Services.strings - .createBundle("chrome://browser/locale/devtools/styleinspector.properties"); + .createBundle("chrome://global/locale/devtools/styleinspector.properties"); let inline = _strings.GetStringFromName("rule.sourceInline"); diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 23af3724066..b8ddea614ad 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -39,7 +39,6 @@ locale/browser/devtools/scratchpad.dtd (%chrome/browser/devtools/scratchpad.dtd) locale/browser/devtools/styleeditor.properties (%chrome/browser/devtools/styleeditor.properties) locale/browser/devtools/styleeditor.dtd (%chrome/browser/devtools/styleeditor.dtd) - locale/browser/devtools/styleinspector.properties (%chrome/browser/devtools/styleinspector.properties) locale/browser/devtools/styleinspector.dtd (%chrome/browser/devtools/styleinspector.dtd) locale/browser/devtools/webConsole.dtd (%chrome/browser/devtools/webConsole.dtd) locale/browser/devtools/VariablesView.dtd (%chrome/browser/devtools/VariablesView.dtd) diff --git a/toolkit/devtools/styleinspector/css-logic.js b/toolkit/devtools/styleinspector/css-logic.js index 168efc1ca00..46273000ada 100644 --- a/toolkit/devtools/styleinspector/css-logic.js +++ b/toolkit/devtools/styleinspector/css-logic.js @@ -730,7 +730,7 @@ CssLogic.getSelectors = function CssLogic_getSelectors(aDOMRule) CssLogic.l10n = function(aName) CssLogic._strings.GetStringFromName(aName); XPCOMUtils.defineLazyGetter(CssLogic, "_strings", function() Services.strings - .createBundle("chrome://browser/locale/devtools/styleinspector.properties")); + .createBundle("chrome://global/locale/devtools/styleinspector.properties")); /** * Is the given property sheet a content stylesheet? diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/styleinspector.properties rename to toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 43250419872..5305609aa71 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -32,6 +32,7 @@ locale/@AB_CD@/global/datetimepicker.dtd (%chrome/global/datetimepicker.dtd) locale/@AB_CD@/global/dateFormat.properties (%chrome/global/dateFormat.properties) locale/@AB_CD@/global/devtools/debugger.properties (%chrome/global/devtools/debugger.properties) + locale/@AB_CD@/global/devtools/styleinspector.properties (%chrome/global/devtools/styleinspector.properties) locale/@AB_CD@/global/dialogOverlay.dtd (%chrome/global/dialogOverlay.dtd) locale/@AB_CD@/global/editMenuOverlay.dtd (%chrome/global/editMenuOverlay.dtd) locale/@AB_CD@/global/filefield.properties (%chrome/global/filefield.properties)