diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-04-20 11:17:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 11:17:30 +0200 |
| commit | e0116ac2b78eb4e621a4d0769e01f8358a6d661c (patch) | |
| tree | fe2898874f0be34a8425281ecba2cb8cb59fb210 /toolkit/components/printing | |
| parent | 32577bdb3d2471c0e5ce4cfd0501a820157230cb (diff) | |
| parent | 21b4cb27cabecdb5580c01891801c9259689ec87 (diff) | |
| download | UXP-e0116ac2b78eb4e621a4d0769e01f8358a6d661c.tar UXP-e0116ac2b78eb4e621a4d0769e01f8358a6d661c.tar.gz UXP-e0116ac2b78eb4e621a4d0769e01f8358a6d661c.tar.lz UXP-e0116ac2b78eb4e621a4d0769e01f8358a6d661c.tar.xz UXP-e0116ac2b78eb4e621a4d0769e01f8358a6d661c.zip | |
Merge pull request #1041 from Ascrod/default-pref
Clean up try/catch blocks for preferences
Diffstat (limited to 'toolkit/components/printing')
| -rw-r--r-- | toolkit/components/printing/content/printPageSetup.js | 9 | ||||
| -rw-r--r-- | toolkit/components/printing/content/printdialog.js | 10 | ||||
| -rw-r--r-- | toolkit/components/printing/content/printjoboptions.js | 9 |
3 files changed, 3 insertions, 25 deletions
diff --git a/toolkit/components/printing/content/printPageSetup.js b/toolkit/components/printing/content/printPageSetup.js index 31eb1bdd3..6bcd97207 100644 --- a/toolkit/components/printing/content/printPageSetup.js +++ b/toolkit/components/printing/content/printPageSetup.js @@ -65,14 +65,7 @@ function initDialog() // --------------------------------------------------- function isListOfPrinterFeaturesAvailable() { - var has_printerfeatures = false; - - try { - has_printerfeatures = gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures"); - } catch (ex) { - } - - return has_printerfeatures; + return gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures", false); } // --------------------------------------------------- diff --git a/toolkit/components/printing/content/printdialog.js b/toolkit/components/printing/content/printdialog.js index e5a38ddce..f9ed94bad 100644 --- a/toolkit/components/printing/content/printdialog.js +++ b/toolkit/components/printing/content/printdialog.js @@ -79,15 +79,7 @@ function stripTrailingWhitespace(element) // --------------------------------------------------- function getPrinterDescription(printerName) { - var s = ""; - - try { - /* This may not work with non-ASCII test (see bug 235763 comment #16) */ - s = gPrefs.getCharPref("print.printer_" + printerName + ".printer_description") - } catch (e) { - } - - return s; + return gPrefs.getCharPref("print.printer_" + printerName + ".printer_description", "") } // --------------------------------------------------- diff --git a/toolkit/components/printing/content/printjoboptions.js b/toolkit/components/printing/content/printjoboptions.js index 26f3ffd85..098358940 100644 --- a/toolkit/components/printing/content/printjoboptions.js +++ b/toolkit/components/printing/content/printjoboptions.js @@ -33,14 +33,7 @@ function checkDouble(element, maxVal) // --------------------------------------------------- function isListOfPrinterFeaturesAvailable() { - var has_printerfeatures = false; - - try { - has_printerfeatures = gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures"); - } catch (ex) { - } - - return has_printerfeatures; + return gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures", false); } // --------------------------------------------------- |