| 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 e14ce4e91e2831a48846073044108f62b1b271cf..45b0f50621d7d20b66a401dc4b9c956dece6b4a4 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
|
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
|
| @@ -156,7 +156,7 @@ Output.STATE_INFO_ = {
|
| Output.RULES = {
|
| navigate: {
|
| 'default': {
|
| - speak: '$name $value $role',
|
| + speak: '$name $value $description $role',
|
| braille: ''
|
| },
|
| alert: {
|
| @@ -207,7 +207,7 @@ Output.RULES = {
|
| '@describe_radio_unselected($name))'
|
| },
|
| slider: {
|
| - speak: '@describe_slider($value, $name)'
|
| + speak: '@describe_slider($value, $name) $help'
|
| },
|
| staticText: {
|
| speak: '$value $name'
|
| @@ -303,13 +303,26 @@ Output.EventType = {
|
| Output.prototype = {
|
| /**
|
| * Gets the output buffer for speech.
|
| + * @param {string=} opt_separator Used to join components of the output.
|
| * @return {!cvox.Spannable}
|
| */
|
| - toSpannable: function() {
|
| + toSpannable: function(opt_separator) {
|
| + opt_separator = opt_separator || '';
|
| return this.buffer_.reduce(function(prev, cur) {
|
| + if (prev === null)
|
| + return cur;
|
| + prev.append(opt_separator);
|
| prev.append(cur);
|
| return prev;
|
| - }, new cvox.Spannable());
|
| + }, null);
|
| + },
|
| +
|
| + /**
|
| + * Gets the output buffer for speech with separator '|'.
|
| + * @return {!cvox.Spannable}
|
| + */
|
| + toSpannableForTest: function() {
|
| + return this.toSpannable('|');
|
| },
|
|
|
| /**
|
|
|