Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1662145, make form interactable when switching to page range all and fix page count for invalid ranges r=mstriemer

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D88879
This commit is contained in:
Emma Malysz 2020-08-31 23:48:15 +00:00
parent 12fefb1ee0
commit 70acdd65af
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/components/printing/content/print.css
View File

@ -84,7 +84,8 @@ body[loading] {
margin: 0;
}
#sheet-count[loading] {
body[rendering] #sheet-count,
body[invalid] #sheet-count {
visibility: hidden;
}

30
toolkit/components/printing/content/print.js
View File

@ -359,6 +359,7 @@ var PrintEventHandler = {
let { previewBrowser, settings } = this;
let stack = previewBrowser.parentElement;
stack.setAttribute("rendering", true);
document.body.setAttribute("rendering", true);
let networkDone = false;
let documentDone = false;
@ -436,6 +437,7 @@ var PrintEventHandler = {
);
stack.removeAttribute("rendering");
document.body.removeAttribute("rendering");
this._previewUpdatingPromise = null;
}
},
@ -931,8 +933,7 @@ class PrintUIForm extends PrintUIControlMixin(HTMLFormElement) {
} else if (e.type == "change" || e.type == "input") {
let isValid = this.checkValidity();
let section = e.target.closest(".section-block");
const sheetCount = document.querySelector("#sheet-count");
sheetCount.toggleAttribute("loading", !isValid);
document.body.toggleAttribute("invalid", !isValid);
if (isValid) {
// aria-describedby will usually cause the first value to be reported.
// Unfortunately, screen readers don't pick up description changes from
@ -942,7 +943,9 @@ class PrintUIForm extends PrintUIControlMixin(HTMLFormElement) {
// aria-live is set on the parent because sheetCount itself might be
// hidden and then shown, and updates are only reported for live
// regions that were already visible.
sheetCount.parentNode.setAttribute("aria-live", "polite");
document
.querySelector("#sheet-count")
.parentNode.setAttribute("aria-live", "polite");
} else {
// We're hiding the sheet count and aria-describedby includes the
// content of hidden elements, so remove aria-describedby.
@ -1106,20 +1109,14 @@ class PageRangeInput extends PrintUIControlMixin(HTMLElement) {
let printAll = e.target.value == "all";
this._startRange.required = this._endRange.required = !printAll;
this.querySelector(".range-group").hidden = printAll;
if (printAll) {
this.dispatchSettingsChange({
printAllOrCustomRange: "all",
});
} else {
this._startRange.value = 1;
this._endRange.value = this._numPages || 1;
this._startRange.value = 1;
this._endRange.value = this._numPages || 1;
this.dispatchSettingsChange({
printAllOrCustomRange: "custom",
startPageRange: this._startRange.value,
endPageRange: this._endRange.value,
});
}
this.dispatchSettingsChange({
printAllOrCustomRange: e.target.value,
startPageRange: this._startRange.value,
endPageRange: this._endRange.value,
});
this._rangeError.hidden = true;
this._startRangeOverflowError.hidden = true;
return;
@ -1280,7 +1277,6 @@ class PageCount extends PrintUIControlMixin(HTMLElement) {
document.l10n.setAttributes(this, "printui-sheets-count", {
sheetCount: this.numPages * this.numCopies,
});
this.removeAttribute("loading");
if (this.id) {
// We're showing the sheet count, so let it describe the dialog.
document.body.setAttribute("aria-describedby", this.id);