wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 06:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Pref try/catch block fixup. Tag #991.

Browse source
This commit is contained in:
Ascrod 2019-04-13 17:27:59 -04:00 • committed by Roy Tam
commit 09bcb1f834
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
devtools/client/framework/toolbox-process-window.js
View file

@ -103,8 +103,8 @@ function openToolbox({ form, chrome, isTabActor }) {
// Remember the last panel that was used inside of this profile. // Remember the last panel that was used inside of this profile.
// But if we are testing, then it should always open the debugger panel. // But if we are testing, then it should always open the debugger panel.
let selectedTool = let selectedTool =
Services.prefs.getCharPref("devtools.toolbox.selectedTool", Services.prefs.getCharPref("devtools.browsertoolbox.panel",
Services.prefs.getCharPref("devtools.browsertoolbox.panel", Services.prefs.getCharPref("devtools.toolbox.selectedTool",
"jsdebugger")); "jsdebugger"));
let options = { customIframe: frame }; let options = { customIframe: frame };

13
toolkit/components/search/current/nsSearchService.js
View file

@ -983,11 +983,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) {
var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID", var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID",
Services.appinfo.distributionID || ""); Services.appinfo.distributionID || "");
var official; var official = MOZ_OFFICIAL;
if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL)) try {
official = "official"; if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official"))
else official = "official";
official = "unofficial"; else
official = "unofficial";
}
catch (ex) { }
// Custom search parameters. These are only available to default search // Custom search parameters. These are only available to default search
// engines. // engines.

13
toolkit/components/search/orginal/nsSearchService.js
View file

@ -1024,11 +1024,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) {
var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID", var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID",
MOZ_DISTRIBUTION_ID || ""); MOZ_DISTRIBUTION_ID || "");
var official; var official = MOZ_OFFICIAL;
if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL)) try {
official = "official"; if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official"))
else official = "official";
official = "unofficial"; else
official = "unofficial";
}
catch (ex) { }
// Custom search parameters. These are only available to default search // Custom search parameters. These are only available to default search
// engines. // engines.