Bug 757954 - Replace INCLUDE_ROLE with INCLUDE_DESC in AccessFu UtteranceGenerator. r=MarcoZ

This commit is contained in:
Eitan Isaacson 2012-05-24 11:46:04 -07:00
parent bea6cbdf8b
commit ae98b5d7cc

View File

@ -9,7 +9,7 @@ const Ci = Components.interfaces;
const Cu = Components.utils;
const Cr = Components.results;
const INCLUDE_ROLE = 0x01;
const INCLUDE_DESC = 0x01;
const INCLUDE_NAME = 0x02;
const INCLUDE_CUSTOM = 0x04;
@ -122,62 +122,62 @@ var UtteranceGenerator = {
},
verbosityRoleMap: {
'menubar': INCLUDE_ROLE,
'scrollbar': INCLUDE_ROLE,
'grip': INCLUDE_ROLE,
'alert': INCLUDE_ROLE,
'menupopup': INCLUDE_ROLE,
'menuitem': INCLUDE_ROLE,
'tooltip': INCLUDE_ROLE,
'menubar': INCLUDE_DESC,
'scrollbar': INCLUDE_DESC,
'grip': INCLUDE_DESC,
'alert': INCLUDE_DESC,
'menupopup': INCLUDE_DESC,
'menuitem': INCLUDE_DESC,
'tooltip': INCLUDE_DESC,
'application': INCLUDE_NAME,
'document': INCLUDE_NAME,
'toolbar': INCLUDE_ROLE,
'link': INCLUDE_ROLE,
'list': INCLUDE_ROLE,
'listitem': INCLUDE_ROLE,
'outline': INCLUDE_ROLE,
'outlineitem': INCLUDE_ROLE,
'pagetab': INCLUDE_ROLE,
'graphic': INCLUDE_ROLE | INCLUDE_NAME,
'toolbar': INCLUDE_DESC,
'link': INCLUDE_DESC,
'list': INCLUDE_DESC,
'listitem': INCLUDE_DESC,
'outline': INCLUDE_DESC,
'outlineitem': INCLUDE_DESC,
'pagetab': INCLUDE_DESC,
'graphic': INCLUDE_DESC | INCLUDE_NAME,
'statictext': INCLUDE_NAME,
'text leaf': INCLUDE_NAME,
'pushbutton': INCLUDE_ROLE,
'checkbutton': INCLUDE_ROLE | INCLUDE_NAME,
'radiobutton': INCLUDE_ROLE | INCLUDE_NAME,
'combobox': INCLUDE_ROLE,
'droplist': INCLUDE_ROLE,
'progressbar': INCLUDE_ROLE,
'slider': INCLUDE_ROLE,
'spinbutton': INCLUDE_ROLE,
'diagram': INCLUDE_ROLE,
'animation': INCLUDE_ROLE,
'equation': INCLUDE_ROLE,
'buttonmenu': INCLUDE_ROLE,
'pagetablist': INCLUDE_ROLE,
'canvas': INCLUDE_ROLE,
'check menu item': INCLUDE_ROLE,
'label': INCLUDE_ROLE,
'password text': INCLUDE_ROLE,
'popup menu': INCLUDE_ROLE,
'radio menu item': INCLUDE_ROLE,
'toggle button': INCLUDE_ROLE,
'header': INCLUDE_ROLE,
'footer': INCLUDE_ROLE,
'entry': INCLUDE_ROLE,
'caption': INCLUDE_ROLE,
'document frame': INCLUDE_ROLE,
'heading': INCLUDE_ROLE,
'calendar': INCLUDE_ROLE,
'combobox list': INCLUDE_ROLE,
'combobox option': INCLUDE_ROLE,
'image map': INCLUDE_ROLE,
'option': INCLUDE_ROLE,
'listbox': INCLUDE_ROLE},
'pushbutton': INCLUDE_DESC,
'checkbutton': INCLUDE_DESC | INCLUDE_NAME,
'radiobutton': INCLUDE_DESC | INCLUDE_NAME,
'combobox': INCLUDE_DESC,
'droplist': INCLUDE_DESC,
'progressbar': INCLUDE_DESC,
'slider': INCLUDE_DESC,
'spinbutton': INCLUDE_DESC,
'diagram': INCLUDE_DESC,
'animation': INCLUDE_DESC,
'equation': INCLUDE_DESC,
'buttonmenu': INCLUDE_DESC,
'pagetablist': INCLUDE_DESC,
'canvas': INCLUDE_DESC,
'check menu item': INCLUDE_DESC,
'label': INCLUDE_DESC,
'password text': INCLUDE_DESC,
'popup menu': INCLUDE_DESC,
'radio menu item': INCLUDE_DESC,
'toggle button': INCLUDE_DESC,
'header': INCLUDE_DESC,
'footer': INCLUDE_DESC,
'entry': INCLUDE_DESC,
'caption': INCLUDE_DESC,
'document frame': INCLUDE_DESC,
'heading': INCLUDE_DESC,
'calendar': INCLUDE_DESC,
'combobox list': INCLUDE_DESC,
'combobox option': INCLUDE_DESC,
'image map': INCLUDE_DESC,
'option': INCLUDE_DESC,
'listbox': INCLUDE_DESC},
objectUtteranceFunctions: {
defaultFunc: function defaultFunc(aAccessible, aRoleStr, aFlags) {
let name = (aFlags & INCLUDE_NAME) ? (aAccessible.name || '') : '';
let desc = (aFlags & INCLUDE_ROLE) ?
let desc = (aFlags & INCLUDE_DESC) ?
this._getLocalizedRole(aRoleStr) : '';
let utterance = [];