Bug 1960045: Modify shared-head.js to use hidden instead of aria-hidden for contentSetup r=Jamie
Differential Revision: https://phabricator.services.mozilla.com/D245321
This commit is contained in:
@@ -351,8 +351,10 @@ function wrapWithIFrame(doc, options = {}) {
|
|||||||
if (options.contentSetup) {
|
if (options.contentSetup) {
|
||||||
// Hide the body initially so we can ensure that any changes made by
|
// Hide the body initially so we can ensure that any changes made by
|
||||||
// contentSetup are included when the body's content is initially added to
|
// contentSetup are included when the body's content is initially added to
|
||||||
// the accessibility tree.
|
// the accessibility tree. Use `hidden` instead of `aria-hidden` because the
|
||||||
iframeDocBodyAttrs["aria-hidden"] = "true";
|
// latter is ignored when applied to top level docs/<body> elements and we
|
||||||
|
// want to remain consistent with our handling for non-iframe docs.
|
||||||
|
iframeDocBodyAttrs.hidden = true;
|
||||||
}
|
}
|
||||||
if (options.remoteIframe) {
|
if (options.remoteIframe) {
|
||||||
// eslint-disable-next-line @microsoft/sdl/no-insecure-url
|
// eslint-disable-next-line @microsoft/sdl/no-insecure-url
|
||||||
@@ -427,8 +429,9 @@ function snippetToURL(doc, options = {}) {
|
|||||||
} else if (options.contentSetup) {
|
} else if (options.contentSetup) {
|
||||||
// Hide the body initially so we can ensure that any changes made by
|
// Hide the body initially so we can ensure that any changes made by
|
||||||
// contentSetup are included when the body's content is initially added to
|
// contentSetup are included when the body's content is initially added to
|
||||||
// the accessibility tree.
|
// the accessibility tree. Use `hidden` instead of `aria-hidden` because the
|
||||||
attrs["aria-hidden"] = "true";
|
// latter is ignored when applied to top level docs/<body> elements.
|
||||||
|
attrs.hidden = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const encodedDoc = encodeURIComponent(
|
const encodedDoc = encodeURIComponent(
|
||||||
@@ -614,13 +617,13 @@ function accessibleTask(doc, task, options = {}) {
|
|||||||
info("Executing contentSetup");
|
info("Executing contentSetup");
|
||||||
const ready = waitForEvent(EVENT_REORDER, currentContentDoc());
|
const ready = waitForEvent(EVENT_REORDER, currentContentDoc());
|
||||||
await invokeContentTask(browser, [], options.contentSetup);
|
await invokeContentTask(browser, [], options.contentSetup);
|
||||||
// snippetToURL set aria-hidden on the body. We now Remove aria-hidden
|
// snippetToURL set hidden on the body. We now Remove hidden
|
||||||
// and wait for a reorder on the body. This guarantees that any
|
// and wait for a reorder on the body. This guarantees that any
|
||||||
// changes made by contentSetup are included when the body's content
|
// changes made by contentSetup are included when the body's content
|
||||||
// is initially added to the accessibility tree and that the
|
// is initially added to the accessibility tree and that the
|
||||||
// accessibility tree is up to date.
|
// accessibility tree is up to date.
|
||||||
await invokeContentTask(browser, [], () => {
|
await invokeContentTask(browser, [], () => {
|
||||||
content.document.body.removeAttribute("aria-hidden");
|
content.document.body.removeAttribute("hidden");
|
||||||
});
|
});
|
||||||
await ready;
|
await ready;
|
||||||
info("contentSetup done");
|
info("contentSetup done");
|
||||||
|
|||||||
Reference in New Issue
Block a user