diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 09:31:03 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:38:27 +0200 |
| commit | 9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4 (patch) | |
| tree | 7909d9aea132eb0ff69929318337d84615efcd26 | |
| parent | 113a825c1f87263ef7e322c31084d00821edbef3 (diff) | |
| download | UXP-9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4.tar UXP-9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4.tar.gz UXP-9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4.tar.lz UXP-9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4.tar.xz UXP-9fc28c55c34dabe42dcdbfccc5fc19d566b7e0b4.zip | |
Issue #65 - Remove AppConstants from toolkit/components/printing
| -rw-r--r-- | toolkit/components/printing/content/printPreviewBindings.xml | 8 | ||||
| -rw-r--r-- | toolkit/components/printing/jar.mn | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/toolkit/components/printing/content/printPreviewBindings.xml b/toolkit/components/printing/content/printPreviewBindings.xml index 182ecc199..c33b22e36 100644 --- a/toolkit/components/printing/content/printPreviewBindings.xml +++ b/toolkit/components/printing/content/printPreviewBindings.xml @@ -161,10 +161,14 @@ let $ = id => document.getAnonymousElementByAttribute(this, "anonid", id); let ltr = document.documentElement.matches(":root:-moz-locale-dir(ltr)"); +#ifdef XP_WIN // Windows 7 doesn't support ⏮ and ⏭ by default, and fallback doesn't // always work (bug 1343330). - let {AppConstants} = Components.utils.import("resource://gre/modules/AppConstants.jsm", {}); - let useCompatCharacters = AppConstants.isPlatformAndVersionAtMost("win", "6.1"); + let useCompatCharacters = Services.vc.compare(Services.sysinfo.getProperty("version"), "6.1") <= 0; +#else + let useCompatCharacters = false; +#endif + let leftEnd = useCompatCharacters ? "⏪" : "⏮"; let rightEnd = useCompatCharacters ? "⏩" : "⏭"; $("navigateHome").label = ltr ? leftEnd : rightEnd; diff --git a/toolkit/components/printing/jar.mn b/toolkit/components/printing/jar.mn index 40f9acf2b..a0e951030 100644 --- a/toolkit/components/printing/jar.mn +++ b/toolkit/components/printing/jar.mn @@ -13,7 +13,7 @@ toolkit.jar: #endif content/global/printPageSetup.js (content/printPageSetup.js) content/global/printPageSetup.xul (content/printPageSetup.xul) - content/global/printPreviewBindings.xml (content/printPreviewBindings.xml) +* content/global/printPreviewBindings.xml (content/printPreviewBindings.xml) content/global/printPreviewProgress.js (content/printPreviewProgress.js) content/global/printPreviewProgress.xul (content/printPreviewProgress.xul) content/global/printProgress.js (content/printProgress.js) |