diff --git a/devtools/client/accessibility/components/DisplayTabbingOrder.js b/devtools/client/accessibility/components/DisplayTabbingOrder.js index d56698a3b3ad..75fc2463d828 100644 --- a/devtools/client/accessibility/components/DisplayTabbingOrder.js +++ b/devtools/client/accessibility/components/DisplayTabbingOrder.js @@ -21,7 +21,6 @@ const { class DisplayTabbingOrder extends PureComponent { static get propTypes() { return { - describedby: PropTypes.string, dispatch: PropTypes.func.isRequired, tabbingOrderDisplayed: PropTypes.bool.isRequired, }; @@ -46,7 +45,7 @@ class DisplayTabbingOrder extends PureComponent { } render() { - const { describedby, tabbingOrderDisplayed } = this.props; + const { tabbingOrderDisplayed } = this.props; return label( { className: @@ -61,7 +60,6 @@ class DisplayTabbingOrder extends PureComponent { checked: tabbingOrderDisplayed, disabled: this.state.disabled, onChange: this.onChange, - "aria-describedby": describedby, }), L10N.getStr("accessibility.toolbar.displayTabbingOrder.label") ); diff --git a/devtools/client/accessibility/components/Toolbar.js b/devtools/client/accessibility/components/Toolbar.js index 5a5b4a295894..153f77cfd6d2 100644 --- a/devtools/client/accessibility/components/Toolbar.js +++ b/devtools/client/accessibility/components/Toolbar.js @@ -28,7 +28,6 @@ const DisplayTabbingOrder = createFactory( const { connect } = require("devtools/client/shared/vendor/react-redux"); function Toolbar({ audit, simulate, supportsTabbingOrder, toolboxDoc }) { - const betaID = "beta"; const optionalSimulationSection = simulate ? [ div({ @@ -44,15 +43,7 @@ function Toolbar({ audit, simulate, supportsTabbingOrder, toolboxDoc }) { role: "separator", className: "devtools-separator", }), - span( - { - className: "beta", - role: "presentation", - id: betaID, - }, - L10N.getStr("accessibility.beta") - ), - DisplayTabbingOrder({ describedby: betaID }), + DisplayTabbingOrder(), ] : []; diff --git a/devtools/client/accessibility/test/node/components/__snapshots__/display-tabbing-order.test.js.snap b/devtools/client/accessibility/test/node/components/__snapshots__/display-tabbing-order.test.js.snap index 57988c37051d..d7e8c1ebdbbd 100644 --- a/devtools/client/accessibility/test/node/components/__snapshots__/display-tabbing-order.test.js.snap +++ b/devtools/client/accessibility/test/node/components/__snapshots__/display-tabbing-order.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`DisplayTabbingOrder component: default render 1`] = `""`; +exports[`DisplayTabbingOrder component: default render 1`] = `""`; exports[`DisplayTabbingOrder component: displaying tabbing order render/update 1`] = `""`; diff --git a/devtools/client/accessibility/test/node/components/display-tabbing-order.test.js b/devtools/client/accessibility/test/node/components/display-tabbing-order.test.js index c8a0dfcc47c8..0ebeac9a0cd7 100644 --- a/devtools/client/accessibility/test/node/components/display-tabbing-order.test.js +++ b/devtools/client/accessibility/test/node/components/display-tabbing-order.test.js @@ -41,20 +41,14 @@ function testCheckbox(wrapper, expected) { const checkbox = label.childAt(0); expect(checkbox.prop("checked")).toBe(expected.checked); expect(checkbox.prop("disabled")).toBe(!!expected.disabled); - if (expected.describedby) { - expect(checkbox.prop("aria-describedby")).toBe(expected.describedby); - } } describe("DisplayTabbingOrder component:", () => { it("default render", () => { - const DESCRIBEDBY = "test"; const store = setupStore(); - const wrapper = mount( - Provider({ store }, DisplayTabbingOrder({ describedby: DESCRIBEDBY })) - ); + const wrapper = mount(Provider({ store }, DisplayTabbingOrder())); - testCheckbox(wrapper, { checked: false, describedby: DESCRIBEDBY }); + testCheckbox(wrapper, { checked: false }); }); it("toggle tabbing order overlay", () => { diff --git a/devtools/client/locales/en-US/accessibility.properties b/devtools/client/locales/en-US/accessibility.properties index d92e3b3e1484..0dc998519db3 100644 --- a/devtools/client/locales/en-US/accessibility.properties +++ b/devtools/client/locales/en-US/accessibility.properties @@ -242,10 +242,6 @@ accessibility.progress.progressbar=Checking #1 node;Checking #1 nodes # accessibility panel overlay shown when accessibility audit is finishing up. accessibility.progress.finishing=Finishing up… -# LOCALIZATION NOTE (accessibility.beta): A title text for the features in the -# accessibility panel that are currently in beta. -accessibility.beta=beta - # LOCALIZATION NOTE (accessibility.pref.scroll.into.view.title): A title # text for the tooltip for the checkbox pref in the accessibility panel that # sets node auto scroll.