cvox2: Avoid uncaught exception on invalid input type.

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 339 matching lines @@
     }
   },
   visited: {
     on: {
       msgId: 'visited_state'
     }
   }
 };
 
 /**
+ * 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',
+  'text': 'input_type_text',
+  'url': 'input_type_url',
+};
+
+/**
  * Rules specifying format of AutomationNodes for output.
  * @type {!Object<Object<Object<string>>>}
  */
 Output.RULES = {
   navigate: {
     'default': {
       speak: '$name $value $help $role',
       braille: ''
     },
     abstractContainer: {
@@ skipping 81 matching lines @@
       speak: '@describe_slider($value, $name) $help'
     },
     staticText: {
       speak: '$value='
     },
     tab: {
       speak: '@describe_tab($name)'
     },
     textField: {
       speak: '$name $value $if(' +
-          '$inputType, @input_type_+$inputType, @input_type_text)',
+          '$inputType, $inputType, $role)',
       braille: ''
     },
     toolbar: {
       enter: '$name $role'
     },
     tree: {
       enter: '$name $role @@list_with_items($countChildren(treeItem))'
     },
     treeItem: {
       enter: '$role $expanded $collapsed ' +
@@ skipping 407 matching lines @@
           var info = Output.ROLE_INFO_[node.role];
           if (info) {
             if (this.formatOptions_.braille)
               msg = cvox.ChromeVox.msgs.getMsg(info.msgId + '_brl');
             else
               msg = cvox.ChromeVox.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);
         } 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 397 matching lines @@
             elem.end);
       });
       spansToRemove.forEach(result.removeSpan.bind(result));
       separator = Output.SPACE;
     });
     return result;
   }
 };
 
 });  // goog.scope