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

chrome/browser/resources/chromeos/chromevox/common/braille_util.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 A utility class for general braille functionality.
  */
 
 
 goog.provide('cvox.BrailleUtil');
@@ skipping 40 matching lines @@
  * n: replaced with braille name.
  * r: replaced with braille role.
  * s: replaced with braille state.
  * c: replaced with braille container role; this potentially returns whitespace,
  * so place at the beginning or end of templates for trimming.
  * v: replaced with braille value.
  * @type {Object<string>}
  */
 cvox.BrailleUtil.TEMPLATE = {
   'base': 'c n v r s',
-  'aria_role_alert': 'r: n',
-  'aria_role_button': 'n r s',
-  'aria_role_checkbox': 'n r s',
-  'aria_role_menuitemcheckbox': 'n r s',
-  'aria_role_menuitemradio': 'n r s',
-  'aria_role_radio': 'n r s',
-  'aria_role_textbox': 'n: v r s',
-  'input_type_button': 'n r s',
-  'input_type_checkbox': 'n r s',
+  'role_alert': 'r: n',
+  'role_button': 'n r s',
+  'role_checkbox': 'n r s',
+  'role_menuitemcheckbox': 'n r s',
+  'role_menuitemradio': 'n r s',
+  'role_radio': 'n r s',
+  'role_textbox': 'n: v r s',
   'input_type_email': 'n: v r s',
   'input_type_number': 'n: v r s',
   'input_type_password': 'n: v r s',
-  'input_type_radio': 'n r s',
   'input_type_search': 'n: v r s',
-  'input_type_submit': 'n r s',
   'input_type_text': 'n: v r s',
-  'input_type_tel': 'n: v r s',
   'input_type_url': 'n: v r s',
-  'tag_button': 'n r s',
   'tag_textarea': 'n: v r s'
 };
 
 
 /**
  * Gets the braille name for a node.
  * See DomUtil for a more precise definition of 'name'.
  * Additionally, whitespace is trimmed.
  * @param {Node} node The node.
  * @return {string} The string representation.
@@ skipping 14 matching lines @@
  */
 cvox.BrailleUtil.getRoleMsg = function(node) {
   if (!node) {
     return '';
   }
   var roleMsg = cvox.DomUtil.getRoleMsg(node, cvox.VERBOSITY_VERBOSE);
   if (roleMsg) {
     roleMsg = cvox.DomUtil.collapseWhitespace(roleMsg);
   }
   if (roleMsg && (roleMsg.length > 0)) {
-    if (cvox.ChromeVox.msgs.getMsg(roleMsg + '_brl')) {
+    if (Msgs.getMsg(roleMsg + '_brl')) {
       roleMsg += '_brl';
     }
   }
   return roleMsg;
 };
 
 
 /**
  * Transforms a {@code cvox.NodeState} list of state messages to the
  * corresponding messages for braille and expands them into a localized
  * string suitable for output on a braille display.
  * @param {cvox.NodeState} stateMsgs The states to expand.  The content of this
  *     array is modified.
  * @return {string} The string representation.
  * @private
  */
 cvox.BrailleUtil.expandStateMsgs_ = function(stateMsgs) {
   stateMsgs.forEach(function(state) {
     // Check to see if a variant of the message with '_brl' exists,
     // and use it if so.
     //
     // Note: many messages are templatized, and if we don't pass any
     // argument to substitute, getMsg might throw an error if the
     // resulting string is empty. To avoid this, we pass a dummy
     // substitution string array here.
     var dummySubs = ['dummy', 'dummy', 'dummy'];
-    if (cvox.ChromeVox.msgs.getMsg(state[0] + '_brl', dummySubs)) {
+    if (Msgs.getMsg(state[0] + '_brl', dummySubs)) {
       state[0] += '_brl';
     }
   });
   return cvox.NodeStateUtil.expand(stateMsgs);
 };
 
 
 /**
  * Gets the braille container role of a node.
  * @param {Node} prev The previous node in navigation.
  * @param {Node} node The node.
  * @return {string} The string representation.
  */
 cvox.BrailleUtil.getContainer = function(prev, node) {
   if (!prev || !node) {
     return '';
   }
   var ancestors = cvox.DomUtil.getUniqueAncestors(prev, node);
   for (var i = 0, container; container = ancestors[i]; i++) {
     var msg = cvox.BrailleUtil.getRoleMsg(container);
     if (msg && cvox.BrailleUtil.CONTAINER.indexOf(msg) != -1) {
-      return cvox.ChromeVox.msgs.getMsg(msg);
+      return Msgs.getMsg(msg);
     }
   }
   return '';
 };
 
 
 /**
  * Gets the braille value of a node. A {@code cvox.ValueSpan} will be
  * attached, along with (possibly) a {@code cvox.ValueSelectionSpan}.
  * @param {Node} node The node.
@@ skipping 69 matching lines @@
   if (!state) {
     if (node) {
       state = cvox.BrailleUtil.expandStateMsgs_(
           cvox.DomUtil.getStateMsgs(node, true));
     } else {
       state = '';
     }
   }
   var role = opt_override.role || '';
   if (!role && roleMsg) {
-    role = cvox.ChromeVox.msgs.getMsg(roleMsg + '_brl') ||
-        cvox.ChromeVox.msgs.getMsg(roleMsg);
+    role = Msgs.getMsg(roleMsg + '_brl') ||
+        Msgs.getMsg(roleMsg);
   }
 
   var templated = new cvox.Spannable();
   var mapChar = function(c) {
     switch (c) {
       case 'n':
         return opt_override.name || cvox.BrailleUtil.getName(node);
       case 'r':
         return role;
       case 's':
@@ skipping 106 matching lines @@
  * @param {number} number The number to clamp.
  * @param {number} min The minimum value to return.
  * @param {number} max The maximum value to return.
  * @return {number} {@code number} if it is within the bounds, or the nearest
  *     number within the bounds otherwise.
  * @private
  */
 cvox.BrailleUtil.clamp_ = function(number, min, max) {
   return Math.min(Math.max(number, min), max);
 };