Refine output of containers when focused

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 403 matching lines @@
  * @type {!Object<Object<Object<string>>>}
  */
 Output.RULES = {
   navigate: {
     'default': {
       speak: '$name $value $state $role $description',
       braille: ''
     },
     abstractContainer: {
       enter: '$nameFromNode $role $state $description',
-      speak: '$descendants $name $value $state $role $description',
+      speak: '$name $value $state $role $description',
       leave: '@exited_container($role)'
     },
     alert: {
       speak: '!doNotInterrupt $role $descendants'
     },
     alertDialog: {
       enter: '$nameFromNode $role $description',
       speak: '$name $role $descendants'
     },
     cell: {
@@ skipping 15 matching lines @@
     },
     div: {
       enter: '$nameFromNode',
       speak: '$name $description $descendants'
     },
     grid: {
       enter: '$nameFromNode $role $description'
     },
     group: {
       enter: '$nameFromNode $state $description',
-      speak: '$descendants $name $value $state $description',
+      speak: '$nameOrDescendants $value $state $description',
       leave: ''
     },
     heading: {
       enter: '!relativePitch(hierarchicalLevel) ' +
           '$nameFromNode= @tag_h+$hierarchicalLevel',
       speak: '!relativePitch(hierarchicalLevel)' +
           ' $nameOrDescendants= @tag_h+$hierarchicalLevel'
     },
     inlineTextBox: {
       speak: '$name='
@@ skipping 957 matching lines @@
     for (var j = uniqueAncestors.length - 2, hashNode;
          (hashNode = uniqueAncestors[j]);
          j--)
       enteredRoleSet[hashNode.role] = true;
 
     for (var i = 0, formatPrevNode;
          (formatPrevNode = prevUniqueAncestors[i]);
          i++) {
       // This prevents very repetitive announcements.
       if (enteredRoleSet[formatPrevNode.role] ||
+          node.role == formatPrevNode.role ||
           localStorage['useVerboseMode'] == 'false')
         continue;
 
       var roleBlock = getMergedRoleBlock(formatPrevNode.role);
       if (roleBlock.leave && localStorage['useVerboseMode'] == 'true')
         this.format_(formatPrevNode, roleBlock.leave, buff, prevNode);
     }
 
     var enterOutputs = [];
     var enterRole = {};
@@ skipping 258 matching lines @@
           break;
         }
         earconFinder = earconFinder.parent;
       }
     }
     return null;
   }
 };
 
 });  // goog.scope