Allows endCallbacks in tts to queue up speech in the speech queue and simplify speech output logic.

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 38 matching lines @@
   /** @type {!cvox.Spannable} */
   this.buffer_ = new cvox.Spannable();
   /** @type {!cvox.Spannable} */
   this.brailleBuffer_ = new cvox.Spannable();
   /** @type {!Array<Object>} */
   this.locations_ = [];
   /** @type {function()} */
   this.speechStartCallback_;
   /** @type {function()} */
   this.speechEndCallback_;
-  /** @type {function()} */
-  this.speechInterruptedCallback_;
 
   /**
    * Current global options.
    * @type {{speech: boolean, braille: boolean, location: boolean}}
    */
   this.formatOptions_ = {speech: true, braille: false, location: true};
 
   /**
    * Speech properties to apply to the entire output.
    * @type {!Object<string, *>}
@@ skipping 227 matching lines @@
   /**
    * Triggers callback for a speech event.
    * @param {function()} callback
    */
   onSpeechEnd: function(callback) {
     this.speechEndCallback_ = callback;
     return this;
   },
 
   /**
-   * Triggers callback for a speech event.
-   * @param {function()} callback
-   */
-  onSpeechInterrupted: function(callback) {
-    this.speechInterruptedCallback_ = callback;
-    return this;
-  },
-
-  /**
    * Executes all specified output.
    */
   go: function() {
     // Speech.
     var buff = this.buffer_;
-
-    var onEvent = function(evt) {
-      switch (evt.type) {
-        case 'start':
-          this.speechStartCallback_();
-          break;
-        case 'end':
-          this.speechEndCallback_();
-          break;
-        case 'interrupted':
-          this.speechInterruptedCallback_ && this.speechInterruptedCallback_();
-          break;
+    if (buff.toString()) {
+      if (this.speechStartCallback_)
+        this.speechProperties_['startCallback'] = this.speechStartCallback_;
+      if (this.speechEndCallback_) {
+        this.speechProperties_['endCallback'] = this.speechEndCallback_;
       }
-    }.bind(this);
-
-    if (buff.toString()) {
-      if (this.speechStartCallback_ ||
-          this.speechEndCallback_ ||
-          this.speechInterruptedCallback_)
-        this.speechProperties_['onEvent'] = onEvent;
 
       cvox.ChromeVox.tts.speak(
           buff.toString(), cvox.QueueMode.FLUSH, this.speechProperties_);
     }
 
     var actions = buff.getSpansInstanceOf(Output.Action);
     if (actions) {
       actions.forEach(function(a) {
         a.run();
       });
@@ skipping 342 matching lines @@
 
   /**
    * Adds to the given buffer with proper delimiters added.
    * @param {!cvox.Spannable} spannable
    * @param {string|!cvox.Spannable} value
    * @param {{ifEmpty: boolean,
    *      annotation: (string|Output.Action|undefined)}=} opt_options
    */
   addToSpannable_: function(spannable, value, opt_options) {
     opt_options = opt_options || {ifEmpty: false, annotation: undefined};
-    if (value.length == 0 && !opt_options.annotation)
+    if ((!value || value.length == 0) && !opt_options.annotation)
       return;
 
     var spannableToAdd = new cvox.Spannable(value, opt_options.annotation);
     if (spannable.getLength() == 0) {
       spannable.append(spannableToAdd);
       return;
     }
 
     if (opt_options.ifEmpty &&
         opt_options.annotation &&
@@ skipping 41 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope