diff --git a/accessible/src/jsat/OutputGenerator.jsm b/accessible/src/jsat/OutputGenerator.jsm index e27f99ea1ffa..3d420bf6c848 100644 --- a/accessible/src/jsat/OutputGenerator.jsm +++ b/accessible/src/jsat/OutputGenerator.jsm @@ -204,19 +204,6 @@ this.OutputGenerator = { landmark); }, - /** - * Adds an entry type attribute to the description if available. - * @param {Array} aDesc Description array. - * @param {nsIAccessible} aAccessible current accessible object. - */ - _addType: function _addType(aDesc, aAccessible) { - let typeName = Utils.getAttributes(aAccessible)['text-input-type']; - if (!typeName) { - return; - } - aDesc.push(gStringBundle.GetStringFromName('textInputType_' + typeName)); - }, - get outputOrder() { if (!this._utteranceOrder) { this._utteranceOrder = new PrefCache('accessibility.accessfu.utterance'); @@ -319,10 +306,8 @@ this.OutputGenerator = { if (aFlags & INCLUDE_DESC) { let desc = this._getLocalizedStates(aStates); let roleStr = this._getLocalizedRole(aRoleStr); - if (roleStr) { - this._addType(desc, aAccessible); + if (roleStr) desc.push(roleStr); - } output.push(desc.join(' ')); } diff --git a/accessible/tests/mochitest/jsat/test_utterance_order.html b/accessible/tests/mochitest/jsat/test_utterance_order.html index c2971062cb4a..d6357574725d 100644 --- a/accessible/tests/mochitest/jsat/test_utterance_order.html +++ b/accessible/tests/mochitest/jsat/test_utterance_order.html @@ -83,29 +83,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984 "Column 1 Row 1", "Fruits and vegetables", "table with 1 column and 1 row" ]] - }, { - accOrElmOrID: "email", - expected: [ - ["e-mail entry", "test@example.com"], - ["test@example.com", "e-mail entry"] - ] - }, { - accOrElmOrID: "search", - expected: [ - ["search entry", "This is a search"], - ["This is a search", "search entry"] - ] - }, { - accOrElmOrID: "tel", - expected: [ - ["telephone entry", "555-5555"], ["555-5555", "telephone entry"] - ] - }, { - accOrElmOrID: "url", - expected: [ - ["URL entry", "http://example.com"], - ["http://example.com", "URL entry"] - ] }, { // Test pivot to list from li_one. accOrElmOrID: "list", @@ -299,10 +276,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=753984 - - - - diff --git a/dom/locales/en-US/chrome/accessibility/AccessFu.properties b/dom/locales/en-US/chrome/accessibility/AccessFu.properties index 2d0d2229ddf9..e9e3eb5d56d6 100644 --- a/dom/locales/en-US/chrome/accessibility/AccessFu.properties +++ b/dom/locales/en-US/chrome/accessibility/AccessFu.properties @@ -72,12 +72,6 @@ definition = definition # More sophisticated roles which are not actual numeric roles textarea = text area -# Text input types -textInputType_email = e-mail -textInputType_search = search -textInputType_tel = telephone -textInputType_url = URL - # More sophisticated object descriptions headingLevel = heading level %S