Chromium Code Reviews| Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
| diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
| index f049a6d8fe2610f0392fbf6622a45668bdebad79..bc747ff5a4e69df8d0f5c9ff730dcbfe7ebcb877 100644 |
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
| @@ -447,7 +447,7 @@ Output.RULES = { |
| }, |
| div: { |
| enter: '$nameFromNode', |
| - speak: '$name $description $descendants' |
| + speak: '$textContent $description' |
|
dmazzoni
2016/10/19 19:56:29
This is similar to nameOrDescendants except that i
|
| }, |
| embeddedObject: { |
| speak: '$name' |
| @@ -537,7 +537,7 @@ Output.RULES = { |
| speak: '$if($name, $name, $docUrl)' |
| }, |
| region: { |
| - speak: '$descendants' |
| + speak: '$textContent' |
| }, |
| row: { |
| enter: '$node(tableRowHeader)' |
| @@ -1199,6 +1199,14 @@ Output.prototype = { |
| return; |
| var related = node[tree.firstChild.value]; |
| this.node_(related, related, Output.EventType.NAVIGATE, buff); |
| + } else if (token == 'textContent') { |
| + if (node.name) { |
| + this.format_(node, '$name', buff); |
| + } else { |
| + node.findAll({role: RoleType.staticText}).forEach(function(text) { |
| + this.node_(text, text, Output.EventType.NAVIGATE, buff); |
| + }.bind(this)); |
| + } |
| } else if (node[token] !== undefined) { |
| options.annotation.push(token); |
| var value = node[token]; |