diff options
Diffstat (limited to 'toolkit/content/widgets')
| -rw-r--r-- | toolkit/content/widgets/browser.xml | 23 | ||||
| -rw-r--r-- | toolkit/content/widgets/preferences.xml | 8 | ||||
| -rw-r--r-- | toolkit/content/widgets/scrollbox.xml | 27 |
3 files changed, 12 insertions, 46 deletions
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index 9c72e86d8..11ed998cc 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -19,14 +19,7 @@ if (this.getAttribute("autoscroll") == "false") return false; - var enabled = true; - try { - enabled = this.mPrefs.getBoolPref("general.autoScroll"); - } - catch (ex) { - } - - return enabled; + return this.mPrefs.getBoolPref("general.autoScroll", true); ]]> </getter> </property> @@ -1427,18 +1420,8 @@ return; // Toggle browse with caret mode - var browseWithCaretOn = false; - var warn = true; - - try { - warn = this.mPrefs.getBoolPref(kPrefWarnOnEnable); - } catch (ex) { - } - - try { - browseWithCaretOn = this.mPrefs.getBoolPref(kPrefCaretBrowsingOn); - } catch (ex) { - } + var browseWithCaretOn = this.mPrefs.getBoolPref(kPrefCaretBrowsingOn, false); + var warn = this.mPrefs.getBoolPref(kPrefWarnOnEnable, true); if (warn && !browseWithCaretOn) { var checkValue = {value:false}; var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] diff --git a/toolkit/content/widgets/preferences.xml b/toolkit/content/widgets/preferences.xml index 9fb2ac7ea..11de03246 100644 --- a/toolkit/content/widgets/preferences.xml +++ b/toolkit/content/widgets/preferences.xml @@ -893,12 +893,8 @@ <![CDATA[ var psvc = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); - var animate = /Mac/.test(navigator.platform); - try { - animate = psvc.getBoolPref("browser.preferences.animateFadeIn"); - } - catch (e) { } - return animate; + return psvc.getBoolPref("browser.preferences.animateFadeIn", + /Mac/.test(navigator.platform)); ]]> </getter> </property> diff --git a/toolkit/content/widgets/scrollbox.xml b/toolkit/content/widgets/scrollbox.xml index ff57a5911..219b7cb5e 100644 --- a/toolkit/content/widgets/scrollbox.xml +++ b/toolkit/content/widgets/scrollbox.xml @@ -80,13 +80,8 @@ <property name="scrollIncrement" readonly="true"> <getter><![CDATA[ if (this._scrollIncrement === null) { - try { - this._scrollIncrement = this._prefBranch - .getIntPref("toolkit.scrollbox.scrollIncrement"); - } - catch (ex) { - this._scrollIncrement = 20; - } + this._scrollIncrement = this._prefBranch + .getIntPref("toolkit.scrollbox.scrollIncrement", 20); } return this._scrollIncrement; ]]></getter> @@ -99,13 +94,8 @@ if (this.hasAttribute("smoothscroll")) { this._smoothScroll = (this.getAttribute("smoothscroll") == "true"); } else { - try { - this._smoothScroll = this._prefBranch - .getBoolPref("toolkit.scrollbox.smoothScroll"); - } - catch (ex) { - this._smoothScroll = true; - } + this._smoothScroll = this._prefBranch + .getBoolPref("toolkit.scrollbox.smoothScroll", true); } } return this._smoothScroll; @@ -737,12 +727,9 @@ </content> <implementation implements="nsITimerCallback, nsIDOMEventListener"> <constructor><![CDATA[ - try { - this._scrollDelay = this._prefBranch - .getIntPref("toolkit.scrollbox.clickToScroll.scrollDelay"); - } - catch (ex) { - } + this._scrollDelay = this._prefBranch + .getIntPref("toolkit.scrollbox.clickToScroll.scrollDelay", + this._scrollDelay); ]]></constructor> <destructor><![CDATA[ |