summaryrefslogtreecommitdiffstats
path: root/toolkit/components/printing/content
diff options
context:
space:
mode:
authorAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-13 10:53:58 -0400
committerAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-13 11:37:45 -0400
commit714e9c9074d9eb2f4063962d07bae6b4f02a1e7a (patch)
treea1ce0e95383947c2cd5f3b514c2e736240d876f8 /toolkit/components/printing/content
parent2d3b7717ae8ddfa5e6561cff5d6daa7f80a939e5 (diff)
downloadUXP-714e9c9074d9eb2f4063962d07bae6b4f02a1e7a.tar
UXP-714e9c9074d9eb2f4063962d07bae6b4f02a1e7a.tar.gz
UXP-714e9c9074d9eb2f4063962d07bae6b4f02a1e7a.tar.lz
UXP-714e9c9074d9eb2f4063962d07bae6b4f02a1e7a.tar.xz
UXP-714e9c9074d9eb2f4063962d07bae6b4f02a1e7a.zip
Issue #991 Part 7: Toolkit Components
Diffstat (limited to 'toolkit/components/printing/content')
-rw-r--r--toolkit/components/printing/content/printPageSetup.js9
-rw-r--r--toolkit/components/printing/content/printdialog.js10
-rw-r--r--toolkit/components/printing/content/printjoboptions.js9
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);
}
// ---------------------------------------------------