Improve braille related message descriptions and clean up message handling in Chromevox.

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
@@ skipping 74 matching lines @@
  * @const {Object<{msgId: string,
  *                 earconId: (string|undefined),
  *                 inherits: (string|undefined)}>}
  * msgId: the message id of the role.
  * earconId: an optional earcon to play when encountering the role.
  * inherits: inherits rules from this role.
  * @private
  */
 Output.ROLE_INFO_ = {
   alert: {
-    msgId: 'aria_role_alert',
+    msgId: 'role_alert',
     earconId: 'ALERT_NONMODAL',
   },
   alertDialog: {
-    msgId: 'aria_role_alertdialog'
+    msgId: 'role_alertdialog'
   },
   article: {
-    msgId: 'aria_role_article',
+    msgId: 'role_article',
     inherits: 'abstractContainer'
   },
   application: {
-    msgId: 'aria_role_application',
+    msgId: 'role_application',
     inherits: 'abstractContainer'
   },
   banner: {
-    msgId: 'aria_role_banner',
+    msgId: 'role_banner',
     inherits: 'abstractContainer'
   },
   button: {
-    msgId: 'tag_button',
+    msgId: 'role_button',
     earconId: 'BUTTON'
   },
   buttonDropDown: {
-    msgId: 'tag_button',
+    msgId: 'role_button',
     earconId: 'BUTTON'
   },
   cell: {
-    msgId: 'aria_role_gridcell'
+    msgId: 'role_gridcell'
   },
   checkBox: {
-    msgId: 'input_type_checkbox'
+    msgId: 'role_checkbox'
   },
   columnHeader: {
-    msgId: 'aria_role_columnheader',
+    msgId: 'role_columnheader',
     inherits: 'abstractContainer'
   },
   comboBox: {
-    msgId: 'aria_role_combobox'
+    msgId: 'role_combobox'
   },
   complementary: {
-    msgId: 'aria_role_complementary',
+    msgId: 'role_complementary',
     inherits: 'abstractContainer'
   },
   contentInfo: {
-    msgId: 'aria_role_contentinfo',
+    msgId: 'role_contentinfo',
     inherits: 'abstractContainer'
   },
   date: {
     msgId: 'input_type_date',
     inherits: 'abstractContainer'
   },
   definition: {
-    msgId: 'aria_role_definition',
+    msgId: 'role_definition',
     inherits: 'abstractContainer'
   },
   dialog: {
-    msgId: 'dialog'
+    msgId: 'role_dialog'
   },
   directory: {
-    msgId: 'aria_role_directory',
+    msgId: 'role_directory',
     inherits: 'abstractContainer'
   },
   document: {
-    msgId: 'aria_role_document',
+    msgId: 'role_document',
     inherits: 'abstractContainer'
   },
   form: {
-    msgId: 'aria_role_form',
+    msgId: 'role_form',
     inherits: 'abstractContainer'
   },
   grid: {
-    msgId: 'aria_role_grid'
+    msgId: 'role_grid'
   },
   group: {
-    msgId: 'aria_role_group'
+    msgId: 'role_group'
   },
   heading: {
-    msgId: 'aria_role_heading',
+    msgId: 'role_heading',
   },
   image: {
-    msgId: 'aria_role_img',
+    msgId: 'role_img',
   },
   inputTime: {
     msgId: 'input_type_time',
     inherits: 'abstractContainer'
   },
   link: {
-    msgId: 'tag_link',
+    msgId: 'role_link',
     earconId: 'LINK'
   },
   listBox: {
-    msgId: 'aria_role_listbox',
+    msgId: 'role_listbox',
     earconId: 'LISTBOX'
   },
   listBoxOption: {
-    msgId: 'aria_role_listitem',
+    msgId: 'role_listitem',
     earconId: 'LIST_ITEM'
   },
   listItem: {
-    msgId: 'aria_role_listitem',
+    msgId: 'role_listitem',
     earconId: 'LIST_ITEM'
   },
   log: {
-    msgId: 'aria_role_log',
+    msgId: 'role_log',
   },
   main: {
-    msgId: 'aria_role_main',
+    msgId: 'role_main',
     inherits: 'abstractContainer'
   },
   marquee: {
-    msgId: 'aria_role_marquee',
+    msgId: 'role_marquee',
   },
   math: {
-    msgId: 'aria_role_math',
+    msgId: 'role_math',
     inherits: 'abstractContainer'
   },
   menu: {
-    msgId: 'aria_role_menu'
+    msgId: 'role_menu'
   },
   menuBar: {
-    msgId: 'aria_role_menubar',
+    msgId: 'role_menubar',
   },
   menuItem: {
-    msgId: 'aria_role_menuitem'
+    msgId: 'role_menuitem'
   },
   menuItemCheckBox: {
-    msgId: 'aria_role_menuitemcheckbox'
+    msgId: 'role_menuitemcheckbox'
   },
   menuItemRadio: {
-    msgId: 'aria_role_menuitemradio'
+    msgId: 'role_menuitemradio'
   },
   menuListOption: {
-    msgId: 'aria_role_menuitem'
+    msgId: 'role_menuitem'
   },
   menuListPopup: {
-    msgId: 'aria_role_menu'
+    msgId: 'role_menu'
   },
   navigation: {
-    msgId: 'aria_role_navigation',
+    msgId: 'role_navigation',
     inherits: 'abstractContainer'
   },
   note: {
-    msgId: 'aria_role_note',
+    msgId: 'role_note',
     inherits: 'abstractContainer'
   },
   popUpButton: {
-    msgId: 'tag_button',
+    msgId: 'role_button',
     earcon: 'LISTBOX'
   },
   radioButton: {
-    msgId: 'input_type_radio'
+    msgId: 'role_radio'
   },
   radioGroup: {
-    msgId: 'aria_role_radiogroup',
+    msgId: 'role_radiogroup',
   },
   region: {
-    msgId: 'aria_role_region',
+    msgId: 'role_region',
     inherits: 'abstractContainer'
   },
   rowHeader: {
-    msgId: 'aria_role_rowheader',
+    msgId: 'role_rowheader',
     inherits: 'abstractContainer'
   },
   scrollBar: {
-    msgId: 'aria_role_scrollbar',
+    msgId: 'role_scrollbar',
   },
   search: {
-    msgId: 'aria_role_search',
+    msgId: 'role_search',
     inherits: 'abstractContainer'
   },
   separator: {
-    msgId: 'aria_role_separator',
+    msgId: 'role_separator',
     inherits: 'abstractContainer'
   },
   spinButton: {
-    msgId: 'aria_role_spinbutton',
+    msgId: 'role_spinbutton',
     earconId: 'LISTBOX'
   },
   status: {
-    msgId: 'aria_role_status'
+    msgId: 'role_status'
   },
   tab: {
-    msgId: 'aria_role_tab'
+    msgId: 'role_tab'
   },
   tabList: {
-    msgId: 'aria_role_tablist'
+    msgId: 'role_tablist'
   },
   tabPanel: {
-    msgId: 'aria_role_tabpanel'
+    msgId: 'role_tabpanel'
   },
   textBox: {
     msgId: 'input_type_text',
     earconId: 'EDITABLE_TEXT'
   },
   textField: {
     msgId: 'input_type_text',
     earconId: 'EDITABLE_TEXT'
   },
   time: {
     msgId: 'tag_time',
     inherits: 'abstractContainer'
   },
   timer: {
-    msgId: 'aria_role_timer'
+    msgId: 'role_timer'
   },
   toolbar: {
-    msgId: 'aria_role_toolbar'
+    msgId: 'role_toolbar'
   },
   tree: {
-    msgId: 'aria_role_tree'
+    msgId: 'role_tree'
   },
   treeItem: {
-    msgId: 'aria_role_treeitem'
+    msgId: 'role_treeitem'
   }
 };
 
 /**
  * Metadata about supported automation states.
  * @const {!Object<{on: {msgId: string, earconId: string},
  *                  off: {msgId: string, earconId: string},
  *                  omitted: {msgId: string, earconId: string}}>}
  *     on: info used to describe a state that is set to true.
  *     off: info used to describe a state that is set to false.
@@ skipping 38 matching lines @@
   }
 };
 
 /**
  * Maps input types to message IDs.
  * @const {Object<string>}
  * @private
  */
 Output.INPUT_TYPE_MESSAGE_IDS_ = {
   'email': 'input_type_email',
-  'file': 'input_type_file',
   'number': 'input_type_number',
   'password': 'input_type_password',
   'search': 'input_type_search',
-  'tel': 'input_type_tel',
+  'tel': 'input_type_number',
   'text': 'input_type_text',
   'url': 'input_type_url',
 };
 
 /**
  * Rules specifying format of AutomationNodes for output.
  * @type {!Object<Object<Object<string>>>}
  */
 Output.RULES = {
   navigate: {
@@ skipping 52 matching lines @@
       enter: '$role'
     },
     menu: {
       enter: '$name $role @@list_with_items($countChildren(menuItem))'
     },
     menuItem: {
       speak: '$name $role $if($haspopup, @has_submenu) ' +
           '@describe_index($indexInParent, $parentChildCount)'
     },
     menuListOption: {
-      speak: '$name $value @aria_role_menuitem ' +
+      speak: '$name $value @role_menuitem ' +
           '@describe_index($indexInParent, $parentChildCount)'
     },
     paragraph: {
       speak: '$descendants'
     },
     popUpButton: {
       speak: '$value $name $role @aria_has_popup ' +
           '$if($collapsed, @aria_expanded_false, @aria_expanded_true)'
     },
     radioButton: {
@@ skipping 52 matching lines @@
   menuListValueChanged: {
     'default': {
       speak: '$value $name ' +
           '$find({"state": {"selected": true, "invisible": false}}, ' +
               '@describe_index($indexInParent, $parentChildCount)) '
     }
   },
   alert: {
     default: {
       speak: '!doNotInterrupt ' +
-          '@aria_role_alert $name $earcon(ALERT_NONMODAL) $descendants'
+          '@role_alert $name $earcon(ALERT_NONMODAL) $descendants'
     }
   }
 };
 
 /**
  * Custom actions performed while rendering an output string.
  * @constructor
  */
 Output.Action = function() {
 };
@@ skipping 361 matching lines @@
           var prev = null;
           if (node)
             prev = cursors.Range.fromNode(node);
           this.range_(subrange, prev, 'navigate', buff);
         } else if (token == 'role') {
           options.annotation.push(token);
           var msg = node.role;
           var info = Output.ROLE_INFO_[node.role];
           if (info) {
             if (this.formatOptions_.braille)
-              msg = cvox.ChromeVox.msgs.getMsg(info.msgId + '_brl');
+              msg = Msgs.getMsg(info.msgId + '_brl');
             else
-              msg = cvox.ChromeVox.msgs.getMsg(info.msgId);
+              msg = Msgs.getMsg(info.msgId);
           } else {
             console.error('Missing role info for ' + node.role);
           }
           this.append_(buff, msg, options);
         } else if (token == 'inputType') {
           if (!node.inputType)
             return;
           options.annotation.push(token);
           var msgId = Output.INPUT_TYPE_MESSAGE_IDS_[node.inputType] ||
               'input_type_text';
           if (this.formatOptions_.braille)
             msgId = msgId + '_brl';
-          this.append_(buff, cvox.ChromeVox.msgs.getMsg(msgId), options);
+          this.append_(buff, Msgs.getMsg(msgId), options);
         } else if (token == 'tableRowIndex' ||
             token == 'tableCellColumnIndex') {
           var value = node[token];
           if (!value)
             return;
           value = String(value + 1);
           options.annotation.push(token);
           this.append_(buff, value, options);
         } else if (node[token] !== undefined) {
           options.annotation.push(token);
@@ skipping 11 matching lines @@
             resolvedInfo = node.state[token] ? stateInfo.on : stateInfo.off;
           if (!resolvedInfo)
             return;
           if (this.formatOptions_.speech && resolvedInfo.earconId) {
             options.annotation.push(
                 new Output.EarconAction(resolvedInfo.earconId));
           }
           var msgId =
               this.formatOptions_.braille ? resolvedInfo.msgId + '_brl' :
               resolvedInfo.msgId;
-          var msg = cvox.ChromeVox.msgs.getMsg(msgId);
+          var msg = Msgs.getMsg(msgId);
           this.append_(buff, msg, options);
         } else if (tree.firstChild) {
           // Custom functions.
           if (token == 'if') {
             var cond = tree.firstChild;
             var attrib = cond.value.slice(1);
             if (node[attrib] || node.state[attrib])
               this.format_(node, cond.nextSibling, buff);
             else
               this.format_(node, cond.nextSibling.nextSibling, buff);
@@ skipping 36 matching lines @@
             if (curArg.value[0] != '$') {
               console.error('Unexpected value: ' + curArg.value);
               return;
             }
             var msgBuff = [];
             this.format_(node, curArg, msgBuff);
             msgArgs = msgArgs.concat(msgBuff);
             curArg = curArg.nextSibling;
           }
         }
-        var msg = cvox.ChromeVox.msgs.getMsg(msgId, msgArgs);
+        var msg = Msgs.getMsg(msgId, msgArgs);
         try {
           if (this.formatOptions_.braille)
-            msg = cvox.ChromeVox.msgs.getMsg(msgId + '_brl', msgArgs) || msg;
+            msg = Msgs.getMsg(msgId + '_brl', msgArgs) || msg;
         } catch(e) {}
 
         if (!msg) {
           console.error('Could not get message ' + msgId);
           return;
         }
 
         if (isPluralized) {
           var arg = tree.firstChild;
           if (!arg || arg.nextSibling) {
@@ skipping 305 matching lines @@
             elem.end);
       });
       spansToRemove.forEach(result.removeSpan.bind(result));
       separator = Output.SPACE;
     });
     return result;
   }
 };
 
 });  // goog.scope