From fc76f40dd53312f91d64aae4e1f2f91b77d46d8c Mon Sep 17 00:00:00 2001 From: "loadrunner%betak.net" Date: Sat, 8 Apr 2006 00:57:44 +0000 Subject: [PATCH] b144740, polish, javascript strict warnings in pref-contentpacks.xul, r=kairo, sr=blizzard, a=asa git-svn-id: svn://10.0.0.236/trunk@193881 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/common/pref/pref-locales.xul | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/mozilla/suite/common/pref/pref-locales.xul b/mozilla/suite/common/pref/pref-locales.xul index cd5d90371e0..c649b048c56 100644 --- a/mozilla/suite/common/pref/pref-locales.xul +++ b/mozilla/suite/common/pref/pref-locales.xul @@ -10,7 +10,7 @@ implied. See the License for the specific language governing rights and limitations under the License. - Contributor(s): J. M. Betak + Contributor(s): J.Betak Josh Soref --> @@ -69,10 +69,16 @@ var newContentPack; var shouldRemoveFaslFile; + //change scope to avoid redeclaration per JS strict warnings + var selectedItem; + var observerService; + var chromeRegistry; + + try { var listbox = document.getElementById("contentPackList"); if (listbox) { - var selectedItem = listbox.selectedItems.length ? listbox.selectedItems[0] : null; + selectedItem = listbox.selectedItems.length ? listbox.selectedItems[0] : null; if (selectedItem) { newContentPack = selectedItem.getAttribute("value"); } @@ -85,15 +91,13 @@ if (newContentPack && (newContentPack != oldContentPack)) { try { - var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIXULChromeRegistry); + chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIChromeRegistry); chromeRegistry.selectLocale(newContentPack, true); shouldRemoveFaslFile = true; - var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); + observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); observerService.notifyObservers(null, "locale-selected", null); } - catch(e) { - return false; - } + catch(e) {} } //Switch the Language pack if necessary @@ -103,7 +107,7 @@ try { var languageList = document.getElementById("languagePackList"); if (languageList) { - var selectedItem = languageList.selectedItems.length ? languageList.selectedItems[0] : null; + selectedItem = languageList.selectedItems.length ? languageList.selectedItems[0] : null; if (selectedItem) { newLanguagePack = selectedItem.getAttribute("value"); } @@ -115,15 +119,13 @@ if (newLanguagePack && (newLanguagePack != oldLanguagePack)) { try { - var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIXULChromeRegistry); + chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIChromeRegistry); chromeRegistry.selectLocale(newLanguagePack, true); shouldRemoveFaslFile = true; - var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); + observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); observerService.notifyObservers(null, "locale-selected", null); } - catch(e) { - return false; - } + catch(e) {} } // If we changed locale, we need to destroy the fastload file so that it