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

chrome/browser/resources/chromeos/chromevox/common/dom_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 collection of JavaScript utilities used to simplify working
  * with the DOM.
  */
 
 
@@ skipping 17 matching lines @@
 };
 
 
 /**
  * Note: If you are adding a new mapping, the new message identifier needs a
  * corresponding braille message. For example, a message id 'tag_button'
  * requires another message 'tag_button_brl' within messages.js.
  * @type {Object}
  */
 cvox.DomUtil.INPUT_TYPE_TO_INFORMATION_TABLE_MSG = {
-  'button' : 'input_type_button',
-  'checkbox' : 'input_type_checkbox',
+  'button' : 'aria_role_button',
+  'checkbox' : 'aria_role_checkbox',
   'color' : 'input_type_color',
   'datetime' : 'input_type_datetime',
   'datetime-local' : 'input_type_datetime_local',
   'date' : 'input_type_date',
   'email' : 'input_type_email',
   'file' : 'input_type_file',
-  'image' : 'input_type_image',
+  'image' : 'aria_role_button',
   'month' : 'input_type_month',
   'number' : 'input_type_number',
   'password' : 'input_type_password',
-  'radio' : 'input_type_radio',
-  'range' : 'input_type_range',
+  'radio' : 'aria_role_radio',

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

This is another example. I think it'd be better if it was just role_radio.

+  'range' : 'aria_role_slider',
   'reset' : 'input_type_reset',
   'search' : 'input_type_search',
-  'submit' : 'input_type_submit',
-  'tel' : 'input_type_tel',
+  'submit' : 'aria_role_button',
+  'tel' : 'input_type_number',
   'text' : 'input_type_text',
   'url' : 'input_type_url',
   'week' : 'input_type_week'
 };
 
 
 /**
  * Note: If you are adding a new mapping, the new message identifier needs a
  * corresponding braille message. For example, a message id 'tag_button'
  * requires another message 'tag_button_brl' within messages.js.
  * @type {Object}
  */
 cvox.DomUtil.TAG_TO_INFORMATION_TABLE_VERBOSE_MSG = {
   'A' : 'tag_link',
   'ARTICLE' : 'tag_article',
   'ASIDE' : 'tag_aside',
   'AUDIO' : 'tag_audio',
-  'BUTTON' : 'tag_button',
+  'BUTTON' : 'aria_role_button',
   'FOOTER' : 'tag_footer',
   'H1' : 'tag_h1',
   'H2' : 'tag_h2',
   'H3' : 'tag_h3',
   'H4' : 'tag_h4',
   'H5' : 'tag_h5',
   'H6' : 'tag_h6',
   'HEADER' : 'tag_header',
   'HGROUP' : 'tag_hgroup',
   'LI' : 'tag_li',
   'MARK' : 'tag_mark',
   'NAV' : 'tag_nav',
   'OL' : 'tag_ol',
   'SECTION' : 'tag_section',
   'SELECT' : 'tag_select',
   'TABLE' : 'tag_table',
   'TEXTAREA' : 'tag_textarea',
   'TIME' : 'tag_time',
   'UL' : 'tag_ul',
   'VIDEO' : 'tag_video'
 };
 
 /**
  * ChromeVox does not speak the omitted tags.
  * @type {Object}
  */
 cvox.DomUtil.TAG_TO_INFORMATION_TABLE_BRIEF_MSG = {
   'AUDIO' : 'tag_audio',
-  'BUTTON' : 'tag_button',
+  'BUTTON' : 'aria_role_button',
   'SELECT' : 'tag_select',
   'TABLE' : 'tag_table',
   'TEXTAREA' : 'tag_textarea',
   'VIDEO' : 'tag_video'
 };
 
 /**
  * These tags are treated as text formatters.
  * @type {Array<string>}
  */
@@ skipping 752 matching lines @@
   if (node.constructor == HTMLSelectElement) {
     node = /** @type {HTMLSelectElement} */(node);
     var value = '';
     var start = node.selectedOptions ? node.selectedOptions[0] : null;
     var end = node.selectedOptions ?
         node.selectedOptions[node.selectedOptions.length - 1] : null;
     // TODO(dtseng): Keeping this stateless means we describe the start and end
     // of the selection only since we don't know which was added or
     // removed. Once we keep the previous selection, we can read the diff.
     if (start && end && start != end) {
-      value = cvox.ChromeVox.msgs.getMsg(
+      value = Msgs.getMsg(
         'selected_options_value', [start.text, end.text]);
     } else if (start) {
       value = start.text + '';
     }
     return value;
   }
 
   if (node.constructor == HTMLTextAreaElement) {
     return node.value;
   }
@@ skipping 420 matching lines @@
  * ARIA roles are given priority; if there is no ARIA role set, the role
  * will be determined by the HTML tag for the node.
  *
  * @param {Node} targetNode The node to get the role name for.
  * @param {number} verbosity The verbosity setting to use.
  * @return {string} The role name for the targetNode.
  */
 cvox.DomUtil.getRole = function(targetNode, verbosity) {
   var roleMsg = cvox.DomUtil.getRoleMsg(targetNode, verbosity) || '';
   var role = roleMsg && roleMsg != ' ' ?
-      cvox.ChromeVox.msgs.getMsg(roleMsg) : '';
+      Msgs.getMsg(roleMsg) : '';
   return role ? role : roleMsg;
 };
 
 
 /**
  * Count the number of items in a list node.
  *
  * @param {Node} targetNode The list node.
  * @return {number} The number of items in the list.
  */
@@ skipping 47 matching lines @@
         'radio-true': 'radio_selected_state',
         'radio-false': 'radio_unselected_state' };
       var msgId = INPUT_MSGS[targetNode.type + '-' + !!targetNode.checked];
       if (msgId) {
         info.push([msgId]);
       }
     }
   } else if (targetNode.tagName == 'SELECT') {
     if (targetNode.selectedOptions && targetNode.selectedOptions.length <= 1) {
       info.push(['list_position',
-                 cvox.ChromeVox.msgs.getNumber(targetNode.selectedIndex + 1),
-                 cvox.ChromeVox.msgs.getNumber(targetNode.options.length)]);
+                 Msgs.getNumber(targetNode.selectedIndex + 1),
+                 Msgs.getNumber(targetNode.options.length)]);
     } else {
       info.push(['selected_options_state',
-          cvox.ChromeVox.msgs.getNumber(targetNode.selectedOptions.length)]);
+          Msgs.getNumber(targetNode.selectedOptions.length)]);
     }
   } else if (targetNode.tagName == 'UL' ||
              targetNode.tagName == 'OL' ||
              role == 'list') {
     info.push(['list_with_items_not_pluralized',
-               cvox.ChromeVox.msgs.getNumber(
+               Msgs.getNumber(
                    cvox.DomUtil.getListLength(targetNode))]);
   }
 
   if (cvox.DomUtil.isDisabled(targetNode)) {
     info.push(['aria_disabled_true']);
   }
 
   if (targetNode.accessKey) {
     info.push(['access_key', targetNode.accessKey]);
   }
@@ skipping 525 matching lines @@
 
 /**
  * Get a string containing the currently selected link's URL.
  * @param {Node} node The link from which URL needs to be extracted.
  * @return {string} The value of the URL.
  */
 cvox.DomUtil.getLinkURL = function(node) {
   if (node.tagName == 'A') {
     if (node.getAttribute('href')) {
       if (cvox.DomUtil.isInternalLink(node)) {
-        return cvox.ChromeVox.msgs.getMsg('internal_link');
+        return Msgs.getMsg('internal_link');
       } else {
         return node.getAttribute('href');
       }
     } else {
       return '';
     }
   } else if (cvox.AriaUtil.getRoleName(node) ==
-             cvox.ChromeVox.msgs.getMsg('aria_role_link')) {
-    return cvox.ChromeVox.msgs.getMsg('unknown_link');
+             Msgs.getMsg('tag_link')) {
+    return Msgs.getMsg('unknown_link');
   }
 
   return '';
 };
 
 
 /**
  * Checks if a given node is inside a table and returns the table node if it is
  * @param {Node} node The node.
  * @param {{allowCaptions: (undefined|boolean)}=} kwargs Optional named args.
@@ skipping 639 matching lines @@
         var describedNode = document.getElementById(describedById);
         if (describedNode) {
           desc += ' ' + cvox.DomUtil.getName(
               describedNode, true, true, true);
         }
       }
     }
   }
   return desc;
 };