diff --git a/toolkit/components/printing/content/printPreviewToolbar.js b/toolkit/components/printing/content/printPreviewToolbar.js
index 548ed4840709..e10831f6bbd8 100644
--- a/toolkit/components/printing/content/printPreviewToolbar.js
+++ b/toolkit/components/printing/content/printPreviewToolbar.js
@@ -16,94 +16,88 @@ customElements.define("printpreview-toolbar", class PrintPreviewToolbar extends
connectedCallback() {
window.addEventListener("unload", this.disconnectedCallback, { once: true });
this.appendChild(MozXULElement.parseXULToFragment(`
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
`, `
%printPreviewDTD;
]>`));
- this.mPrintButton = this.childNodes[0];
+ this.mPrintButton = document.getElementById("print-preview-print");
- this.mPageSetupButton = this.querySelector("[anonid=pageSetup]");
+ this.mPageSetupButton = document.getElementById("print-preview-pageSetup");
- this.mNavigateHomeButton = this.querySelector("[anonid=navigateHome]");
+ this.mNavigateHomeButton = document.getElementById("print-preview-navigateHome");
- this.mNavigatePreviousButton = this.querySelector("[anonid=navigatePrevious]");
+ this.mNavigatePreviousButton = document.getElementById("print-preview-navigatePrevious");
- this.mPageTextBox = this.childNodes[5].childNodes[0];
+ this.mPageTextBox = document.getElementById("print-preview-pageNumber");
- this.mNavigateNextButton = this.querySelector("[anonid=navigateNext]");
+ this.mNavigateNextButton = document.getElementById("print-preview-navigateNext");
- this.mNavigateEndButton = this.querySelector("[anonid=navigateEnd]");
+ this.mNavigateEndButton = document.getElementById("print-preview-navigateEnd");
- this.mTotalPages = this.childNodes[5].childNodes[2];
+ this.mTotalPages = document.getElementById("print-preview-totalPages");
- this.mScaleLabel = this.childNodes[9].firstChild;
+ this.mScaleCombobox = document.getElementById("print-preview-scale-label");
- this.mScaleCombobox = this.childNodes[10].firstChild;
+ this.mPortaitButton = document.getElementById("print-preview-portrait-button");
- this.mOrientButtonsBox = this.childNodes[12];
+ this.mLandscapeButton = document.getElementById("print-preview-landscape-button");
- this.mPortaitButton = this.mOrientButtonsBox.childNodes[0];
-
- this.mLandscapeButton = this.mOrientButtonsBox.childNodes[1];
-
- this.mSimplifyPageCheckbox = this.childNodes[14];
+ this.mSimplifyPageCheckbox = document.getElementById("print-preview-simplify");
this.mSimplifyPageNotAllowed = this.mSimplifyPageCheckbox.disabled;
- this.mSimplifyPageToolbarSeparator = this.childNodes[15];
-
- this.mCustomTitle = this.childNodes[17].firstChild;
+ this.mSimplifyPageToolbarSeparator = this.mSimplifyPageCheckbox.nextSibling;
this.mPrintPreviewObs = "";
@@ -132,10 +126,10 @@ customElements.define("printpreview-toolbar", class PrintPreviewToolbar extends
let useCompatCharacters = AppConstants.isPlatformAndVersionAtMost("win", "6.1");
let leftEnd = useCompatCharacters ? "\u23EA" : "\u23EE";
let rightEnd = useCompatCharacters ? "\u23E9" : "\u23ED";
- this.querySelector("[anonid=navigateHome]").label = ltr ? leftEnd : rightEnd;
- this.querySelector("[anonid=navigatePrevious]").label = ltr ? "\u25C2" : "\u25B8";
- this.querySelector("[anonid=navigateNext]").label = ltr ? "\u25B8" : "\u25C2";
- this.querySelector("[anonid=navigateEnd]").label = ltr ? rightEnd : leftEnd;
+ this.mNavigateHomeButton.label = ltr ? leftEnd : rightEnd;
+ this.mNavigatePreviousButton.label = ltr ? "\u25C2" : "\u25B8";
+ this.mNavigateNextButton.label = ltr ? "\u25B8" : "\u25C2";
+ this.mNavigateEndButton.label = ltr ? rightEnd : leftEnd;
}
destroy() {
@@ -217,8 +211,8 @@ customElements.define("printpreview-toolbar", class PrintPreviewToolbar extends
promptForScaleValue(aValue) {
var value = Math.round(aValue);
- var promptStr = this.mScaleLabel.value;
- var renameTitle = this.mCustomTitle;
+ var promptStr = document.getElementById("print-preview-scale-label").value;
+ var renameTitle = document.getElementById("print-preview-prompt-title");
var result = { value };
let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
var confirmed = Services.prompt.prompt(window, renameTitle, promptStr, result, null, { value });
diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css
index a8969f9fa017..bedb3fee7286 100644
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -121,23 +121,25 @@ toolbar[mode="text"] .toolbarbutton-text {
margin: 3px 5px !important;
}
-toolbar[is="printpreview-toolbar"] .navigate-button {
+/* ::::: print preview ::::: */
+
+.print-preview-navigate-button {
min-width: 1.9em;
}
-toolbar[is="printpreview-toolbar"] .navigate-button > .toolbarbutton-icon {
+.print-preview-navigate-button > .toolbarbutton-icon {
display: none;
}
-toolbar[is="printpreview-toolbar"] .toolbar-portrait-page {
+#print-preview-portrait-button {
list-style-image: url("moz-icon://stock/gtk-orientation-portrait?size=button");
}
-toolbar[is="printpreview-toolbar"] .toolbar-landscape-page {
+#print-preview-landscape-button {
list-style-image: url("moz-icon://stock/gtk-orientation-landscape?size=button");
}
-toolbar[is="printpreview-toolbar"] #pageNumber {
+#print-preview-pageNumber {
/* 3 chars + 4px padding left + 2px padding right + 2*6px border */
width: calc(18px + 3ch);
}
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index ac7ffb7841a3..ef4d1c3369f7 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -131,25 +131,27 @@ toolbar[mode="text"] .toolbarbutton-text {
margin: 3px 5px !important;
}
-toolbar[is="printpreview-toolbar"] .navigate-button {
+/* ::::: print preview ::::: */
+
+.print-preview-navigate-button {
min-width: 1.9em;
}
-toolbar[is="printpreview-toolbar"] .navigate-button > .toolbarbutton-icon {
+.print-preview-navigate-button > .toolbarbutton-icon {
display: none;
}
-toolbar[is="printpreview-toolbar"] .toolbar-portrait-page {
+#print-preview-portrait-button {
list-style-image: url("chrome://global/skin/icons/Print-preview.png");
-moz-image-region: rect(0px 16px 16px 0px);
}
-toolbar[is="printpreview-toolbar"] .toolbar-landscape-page {
+#print-preview-landscape-button {
list-style-image: url("chrome://global/skin/icons/Print-preview.png");
-moz-image-region: rect(0px 32px 16px 16px);
}
-toolbar[is="printpreview-toolbar"] #pageNumber {
+#print-preview-pageNumber {
width: 3ch;
}