FLUID-5936: fix bug in fluid.textToSpeech.checkTTSSupport, rewrite tests to use IoC testing

.eslintrc.json

@@ -28,6 +28,7 @@
       "allow-null"
     ],
     "indent": ["error", 4],
+    "keyword-spacing": "error",
     "new-cap": ["error", { "properties": false }],
     "no-caller": "error",
     "no-cond-assign": [

src/components/textToSpeech/js/TextToSpeech.js

@@ -7,6 +7,12 @@ Licenses.
 
 You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
+
+Includes code from Underscore.js 1.8.3
+http://underscorejs.org
+(c) 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+Underscore may be freely distributed under the MIT license.
+
 */
 
 /* global speechSynthesis, SpeechSynthesisUtterance*/
@@ -45,15 +51,15 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
             var toSpeak = new SpeechSynthesisUtterance(" "); // short text to attempt to speak
             toSpeak.volume = 0; // mutes the Speech Synthesizer
             var timeout = setTimeout(function () {
-                speechSynthesis.cancel();
+                fluid.textToSpeech.deferredSpeechSynthesisControl("cancel");
                 promise.reject();
             }, delay || 1000);
-            toSpeak.onstop = function () {
+            toSpeak.onend = function () {
                 clearTimeout(timeout);
-                speechSynthesis.cancel();
+                fluid.textToSpeech.deferredSpeechSynthesisControl("cancel");
                 promise.resolve();
             };
-            speechSynthesis.speak(toSpeak);
+            fluid.textToSpeech.deferredSpeechSynthesisControl("speak", toSpeak);
         } else {
             setTimeout(promise.reject, 0);
         }
@@ -66,15 +72,13 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
         events: {
             onStart: null,
             onStop: null,
-            onPause: null,
-            onResume: null,
             onError: null,
             onSpeechQueued: null
         },
         members: {
             queue: []
         },
-        // Model paths: speaking, pending, paused, utteranceOpts
+        // Model paths: speaking, pending, paused, utteranceOpts, pauseRequested, resumeRequested
         model: {
             // Changes to the utteranceOpts will only text that is queued after the change.
             // All of these options can be overriden in the queueSpeech method by passing in
@@ -83,7 +87,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
             utteranceOpts: {
                 // text: "", // text to synthesize. avoid as it will override any other text passed in
                 // lang: "", // the language of the synthesized text
-                // voiceURI: "" // a uri pointing at a voice synthesizer to use. If not set, will use the default one provided by the browser
+                // voice: {} // a WebSpeechSynthesis object; if not set, will use the default one provided by the browser
                 // volume: 1, // a value between 0 and 1
                 // rate: 1, // a value from 0.1 to 10 although different synthesizers may have a smaller range
                 // pitch: 1, // a value from 0 to 2
@@ -94,9 +98,13 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                 listener: "fluid.textToSpeech.speak",
                 args: ["{that}", "{change}.value"]
             },
-            "paused": {
-                listener: "fluid.textToSpeech.pause",
-                args: ["{that}", "{change}.value"]
+            "pauseRequested": {
+                listener: "fluid.textToSpeech.requestControl",
+                args: ["{that}", "pause", "{change}"]
+            },
+            "resumeRequested": {
+                listener: "fluid.textToSpeech.requestControl",
+                args: ["{that}", "resume", "{change}"]
             }
         },
         invokers: {
@@ -109,20 +117,20 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                 args: ["{that}"]
             },
             pause: {
-                "this": "speechSynthesis",
-                "method": "pause"
+                changePath: "pauseRequested",
+                value: true
             },
             resume: {
-                "this": "speechSynthesis",
-                "method": "resume"
+                changePath: "resumeRequested",
+                value: true
             },
             getVoices: {
                 "this": "speechSynthesis",
                 "method": "getVoices"
             },
             handleStart: {
-                funcName: "fluid.textToSpeech.handleStart",
-                args: ["{that}"]
+                changePath: "speaking",
+                value: true
             },
             // The handleEnd method is assumed to be triggered asynchronously
             // as it is processed/triggered by the mechanism voicing the utterance.
@@ -142,35 +150,97 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
         }
     });
 
-    fluid.textToSpeech.speak = function (that, speaking) {
-        that.events[speaking ? "onStart" : "onStop"].fire();
+    // Issue commands to the speechSynthesis interface with deferral (1 ms timeout);
+    // this makes the wrapper behave better when issuing commands, especially
+    // play and pause
+    fluid.textToSpeech.deferredSpeechSynthesisControl = function (control, args) {
+        setTimeout(function () {
+            speechSynthesis[control](args);
+        }, 1);
     };
 
-    fluid.textToSpeech.pause = function (that, paused) {
-        if (paused) {
-            that.events.onPause.fire();
-        } else if (that.model.speaking) {
-            that.events.onResume.fire();
+    // Throttle implementation adapted from underscore.js 1.8.3; see
+    // file header for license details
+    // Returns a version of a function that will only be called max once
+    // every "wait" MS
+    fluid.textToSpeech.throttle = function (func, wait, options) {
+        var timeout, context, args, result;
+        var previous = 0;
+        if (!options) {
+            options = {};
         }
+
+        var later = function () {
+            previous = options.leading === false ? 0 : new Date().getTime();
+            timeout = null;
+            result = func.apply(context, args);
+            if (!timeout) {
+                context = args = null;
+            }
+        };
+
+        var throttled = function () {
+            var now = new Date().getTime();
+            if (!previous && options.leading === false) {
+                previous = now;
+            }
+            var remaining = wait - (now - previous);
+            context = this;
+            args = arguments;
+            if (remaining <= 0 || remaining > wait) {
+                if (timeout) {
+                    clearTimeout(timeout);
+                    timeout = null;
+                }
+                previous = now;
+
+                result = func.apply(context, args);
+                if (!timeout) {
+                    context = args = null;
+                }
+            } else if (!timeout && options.trailing !== false) {
+                timeout = setTimeout(later, remaining);
+            }
+            return result;
+        };
+
+        throttled.cancel = function () {
+            clearTimeout(timeout);
+            previous = 0;
+            timeout = context = args = null;
+        };
+        return throttled;
     };
 
-    fluid.textToSpeech.handleStart = function (that) {
-        that.queue.shift();
-        that.applier.change("speaking", true);
+    // Throttled version of deferred speech synthesis control
+    fluid.textToSpeech.throttleControl = fluid.textToSpeech.throttle(fluid.textToSpeech.deferredSpeechSynthesisControl, 100, {leading: false});
 
-        if (that.queue.length) {
-            that.applier.change("pending", true);
+    fluid.textToSpeech.speak = function (that, speaking) {
+        that.events[speaking ? "onStart" : "onStop"].fire();
+    };
+
+    fluid.textToSpeech.requestControl = function (that, control, change) {
+        // If there's a control request (value change to true), clear and
+        // execute it
+        if (change.value) {
+            that.applier.change(change.path, false);
+            fluid.textToSpeech.throttleControl(control);
         }
     };
 
     fluid.textToSpeech.handleEnd = function (that) {
+
+        that.queue.shift();
+
         var resetValues = {
             speaking: false,
             pending: false,
             paused: false
         };
 
-        if (!that.queue.length) {
+        if (that.queue.length) {
+            that.applier.change("pending", true);
+        } else if (!that.queue.length) {
             var newModel = $.extend({}, that.model, resetValues);
             that.applier.change("", newModel);
         }
@@ -186,6 +256,8 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
         };
 
         var toSpeak = new SpeechSynthesisUtterance(text);
+
+
         var eventBinding = {
             onstart: that.handleStart,
             onend: that.handleEnd,
@@ -195,14 +267,19 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
         };
         $.extend(toSpeak, that.model.utteranceOpts, options, eventBinding);
 
-        that.queue.push(text);
+        // Store toSpeak additionally on the queue to help deal
+        // with premature garbage collection described at https://bugs.chromium.org/p/chromium/issues/detail?id=509488#c11
+        // this makes the speech synthesis behave much better in Safari in
+        // particular
+        that.queue.push({text: text, utterance: toSpeak});
+
         that.events.onSpeechQueued.fire(text);
-        speechSynthesis.speak(toSpeak);
+        fluid.textToSpeech.deferredSpeechSynthesisControl("speak", toSpeak);
     };
 
     fluid.textToSpeech.cancel = function (that) {
         that.queue = [];
-        speechSynthesis.cancel();
+        fluid.textToSpeech.deferredSpeechSynthesisControl("cancel");
     };
 
 })(jQuery, fluid_2_0_0);

src/framework/preferences/js/Panels.js

@@ -440,7 +440,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
      */
     fluid.prefs.compositePanel.hideInactive = function (that) {
         fluid.each(that.options.components, function (componentOpts, componentName) {
-            if(fluid.prefs.compositePanel.isPanel(componentOpts.type, componentOpts.options) && !fluid.prefs.compositePanel.isActivePanel(that[componentName])) {
+            if (fluid.prefs.compositePanel.isPanel(componentOpts.type, componentOpts.options) && !fluid.prefs.compositePanel.isActivePanel(that[componentName])) {
                 that.locate(componentName).hide();
             }
         });

tests/component-tests/textToSpeech/html/TextToSpeech-test.html

@@ -24,6 +24,10 @@
         <script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script type="text/javascript" src="../../../lib/jquery-ui/js/jquery.simulate.js"></script>
 
+        <!-- needed for IoC testing framework -->
+        <script type="text/javascript" src="../../../../src/framework/enhancement/js/ContextAwareness.js"></script>
+        <script src="../../../test-core/utils/js/IoCTestUtils.js"></script>
+
         <!--  These are tests that have been written using this page as data and test supports -->
         <script type="text/javascript" src="../js/TextToSpeechTests.js"></script>