Clean up Panel menu text labels.

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 431 matching lines @@
     grid: {
       enter: '$nameFromNode $role $description'
     },
     group: {
       enter: '$nameFromNode $state $description',
       speak: '$nameOrDescendants $value $state $description',
       leave: ''
     },
     heading: {
       enter: '!relativePitch(hierarchicalLevel) ' +
-          '$nameFromNode= @tag_h+$hierarchicalLevel',
-      speak: '!relativePitch(hierarchicalLevel)' +
-          ' $nameOrDescendants= @tag_h+$hierarchicalLevel $state'
+          '$nameFromNode= ' +
+          '$if($hierarchicalLevel, @tag_h+$hierarchicalLevel, $role) $state',
+      speak: '!relativePitch(hierarchicalLevel) ' +
+          '$nameOrDescendants= ' +
+          '$if($hierarchicalLevel, @tag_h+$hierarchicalLevel, $role) $state'
     },
     inlineTextBox: {
       speak: '$name='
     },
     inputTime: {
       enter: '$nameFromNode $role $description'
     },
     link: {
       enter: '$nameFromNode= $role $state'
     },
@@ skipping 222 matching lines @@
  * normally queue or do a category flush. This differs from the |withQueueMode|
  * instance method as it can apply to future output.
    * @param {cvox.QueueMode} mode
  */
 Output.forceModeForNextSpeechUtterance = function(mode) {
   Output.forceModeForNextSpeechUtterance_ = mode;
 };
 
 Output.prototype = {
   /**
-   * Gets the spoken output with separator '|'.
-   * @return {!Spannable}
-   */
-  get speechOutputForTest() {
-    return this.speechBuffer_.reduce(function(prev, cur) {
-      if (prev === null)
-        return cur;
-      prev.append('|');
-      prev.append(cur);
-      return prev;
-    }, null);
-  },
-
-  /**
-   * Gets the output buffer for braille.
-   * @return {!Spannable}
-   */
-  get brailleOutputForTest() {
-    return this.createBrailleOutput_();
-  },
-
-  /**
    * @return {boolean} True if there's any speech that will be output.
    */
   get hasSpeech() {
     for (var i = 0; i < this.speechBuffer_.length; i++) {
       if (this.speechBuffer_[i].trim().length)
         return true;
     }
     return false;
   },
 
@@ skipping 960 matching lines @@
       while (earconFinder = ancestors.pop()) {
         var info = Output.ROLE_INFO_[earconFinder.role];
         if (info && info.earconId) {
           return new Output.EarconAction(info.earconId);
           break;
         }
         earconFinder = earconFinder.parent;
       }
     }
     return null;
+  },
+
+  /**
+   * Gets a human friendly string with the contents of output.
+   * @return {string}
+   */
+  toString: function() {
+    return this.speechBuffer_.reduce(function(prev, cur) {
+      if (prev === null)
+        return cur.toString();
+      prev += ' ' + cur.toString();
+      return prev;
+    }, null);
+  },
+
+  /**
+   * Gets the spoken output with separator '|'.
+   * @return {!Spannable}
+   */
+  get speechOutputForTest() {
+    return this.speechBuffer_.reduce(function(prev, cur) {
+      if (prev === null)
+        return cur;
+      prev.append('|');
+      prev.append(cur);
+      return prev;
+    }, null);
+  },
+
+  /**
+   * Gets the output buffer for braille.
+   * @return {!Spannable}
+   */
+  get brailleOutputForTest() {
+    return this.createBrailleOutput_();
   }
 };
 
 });  // goog.scope