mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Bug 135196. F7 to toggle browse with caret hits a JS error. Checking in try/catch fix and forgotten all.js part of original patch for bug 128025. r=bzbarsky, sr=hewitt, a=asa
This commit is contained in:
parent
eedd085473
commit
7fed76935a
@ -119,6 +119,7 @@ pref("browser.helperApps.neverAsk.saveToDisk", "");
|
||||
pref("browser.helperApps.neverAsk.openFile", "");
|
||||
|
||||
pref("accessibility.browsewithcaret", false);
|
||||
pref("accessibility.warn_on_browsewithcaret", true);
|
||||
pref("accessibility.usetexttospeech", "");
|
||||
pref("accessibility.usebrailledisplay", "");
|
||||
pref("accessibility.accesskeycausesactivation", true);
|
||||
|
@ -327,8 +327,19 @@
|
||||
<handler event="keypress" keycode="VK_F7">
|
||||
<![CDATA[
|
||||
// Toggle browse with caret mode
|
||||
var browseWithCaretOn = this.mPrefs.getBoolPref("accessibility.browsewithcaret");
|
||||
if (this.mPrefs.getBoolPref("accessibility.warn_on_browsewithcaret") && !browseWithCaretOn) {
|
||||
var browseWithCaretOn = false;
|
||||
var warn = true;
|
||||
|
||||
try {
|
||||
warn = this.mPrefs.getBoolPref("accessibility.warn_on_browsewithcaret");
|
||||
} catch (ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
browseWithCaretOn = this.mPrefs.getBoolPref("accessibility.browsewithcaret");
|
||||
} catch (ex) {
|
||||
}
|
||||
if (warn && !browseWithCaretOn) {
|
||||
var buttonPressed = {value:1};
|
||||
var checkValue = {value:false};
|
||||
promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
|
||||
@ -344,12 +355,19 @@
|
||||
checkValue, buttonPressed);
|
||||
if (!buttonPressed || buttonPressed.value != 0)
|
||||
return;
|
||||
if (checkValue.value)
|
||||
this.mPrefs.setBoolPref("accessibility.warn_on_browsewithcaret", false);
|
||||
if (checkValue.value) {
|
||||
try {
|
||||
this.mPrefs.setBoolPref("accessibility.warn_on_browsewithcaret", false);
|
||||
}
|
||||
catch (ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Toggle the pref
|
||||
this.mPrefs.setBoolPref("accessibility.browsewithcaret",!browseWithCaretOn);
|
||||
try {
|
||||
this.mPrefs.setBoolPref("accessibility.browsewithcaret",!browseWithCaretOn);
|
||||
} catch (ex) {
|
||||
}
|
||||
]]>
|
||||
</handler>
|
||||
|
Loading…
Reference in New Issue
Block a user