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 93 matching lines @@
   },
   application: {
     msgId: 'aria_role_application',
     inherits: 'abstractContainer'
   },
   banner: {
     msgId: 'aria_role_banner',
     inherits: 'abstractContainer'
   },
   button: {
-    msgId: 'tag_button',
+    msgId: 'aria_role_button',
     earconId: 'BUTTON'
   },
   buttonDropDown: {
-    msgId: 'tag_button',
+    msgId: 'aria_role_button',
     earconId: 'BUTTON'
   },
   cell: {
     msgId: 'aria_role_gridcell'
   },
   checkBox: {
-    msgId: 'input_type_checkbox'
+    msgId: 'aria_role_checkbox'
   },
   columnHeader: {
     msgId: 'aria_role_columnheader',
     inherits: 'abstractContainer'
   },
   comboBox: {
     msgId: 'aria_role_combobox'
   },
   complementary: {
     msgId: 'aria_role_complementary',
     inherits: 'abstractContainer'
   },
   contentInfo: {
     msgId: 'aria_role_contentinfo',
     inherits: 'abstractContainer'
   },
   date: {
     msgId: 'input_type_date',
     inherits: 'abstractContainer'
   },
   definition: {
     msgId: 'aria_role_definition',
     inherits: 'abstractContainer'
   },
   dialog: {
-    msgId: 'dialog'
+    msgId: 'aria_role_dialog'
   },
   directory: {
     msgId: 'aria_role_directory',
     inherits: 'abstractContainer'
   },
   document: {
     msgId: 'aria_role_document',
     inherits: 'abstractContainer'
   },
   form: {
@@ skipping 69 matching lines @@
   },
   navigation: {
     msgId: 'aria_role_navigation',
     inherits: 'abstractContainer'
   },
   note: {
     msgId: 'aria_role_note',
     inherits: 'abstractContainer'
   },
   popUpButton: {
-    msgId: 'tag_button',
+    msgId: 'aria_role_button',
     earcon: 'LISTBOX'
   },
   radioButton: {
-    msgId: 'input_type_radio'
+    msgId: 'aria_role_radio'
   },
   radioGroup: {
     msgId: 'aria_role_radiogroup',
   },
   region: {
     msgId: 'aria_role_region',
     inherits: 'abstractContainer'
   },
   rowHeader: {
     msgId: 'aria_role_rowheader',
@@ skipping 100 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',

[dmazzoni, 2015/09/25 16:23:35]

Is this intentional? I think we should distinguish a telephone number field from
a number field

   'text': 'input_type_text',
   'url': 'input_type_url',
 };
 
 /**
  * Rules specifying format of AutomationNodes for output.
  * @type {!Object<Object<Object<string>>>}
  */
 Output.RULES = {
   navigate: {
@@ skipping 507 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