FLUID-4826: More progress on interval conductor reconstruction. Havin…

…g issues with setting interval list into conductor when the transcript is loaded.
fluid-project · Jan 24, 2013 · ef170e8 · ef170e8
1 parent 550455c
commit ef170e8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
@@ -198,10 +198,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         onTranscriptShow: "{videoPlayer}.events.onTranscriptShow",
                         onTranscriptElementChange: "{videoPlayer}.events.onTranscriptElementChange",
                         onTranscriptsLoaded: "{videoPlayer}.events.onTranscriptsLoaded"//,
-//                        onIntervalChange: "{intervalEventsConductor}.events.onIntervalChange"
-                    },
-                    listeners: {
-//                        onTranscriptsLoaded: "{intervalEventsConductor}.setIntervalList"
                     }
                 }
             },
@@ -213,7 +209,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         onTimeUpdate: "{videoPlayer}.events.onTimeUpdate"
                     },
                     listeners: {
-                        onReady: "{videoPlayer}.events.onIntervalEventsConductorReady"
+//                        onReady: "{videoPlayer}.events.onIntervalEventsConductorReady"
+                        "{transcript}.events.onTranscriptLoaded": "{intervalEventsConductor}.setIntervalList"
+//                        "{transcript}.events.onTranscriptsLoaded": function () {console.log("loaded is fired");}
                     }
                 }
             },
@@ -748,12 +746,20 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     /*************************************************************************************
      * The wiring up of the onTick event btw timer component and intervalEventsConductor *
      *************************************************************************************/
-    fluid.demands("fluid.videoPlayer.media", ["fluid.videoPlayer.intervalEventsConductor"], {
+    fluid.demands("fluid.videoPlayer.media", ["fluid.videoPlayer.intervalEventsConductor", "fluid.videoPlayer"], {
         options: {
             events: {
                 onTimeUpdate: "{intervalEventsConductor}.events.onTimeUpdate"
             }
         }
     });
 
+//    fluid.demands("fluid.videoPlayer.transcript", ["fluid.videoPlayer.intervalEventsConductor", "fluid.videoPlayer"], {
+//        options: {
+//            listeners: {
+//                onTranscriptsLoaded: "{intervalEventsConductor}.setIntervalList"
+//            }
+//        }
+//    });
+
 })(jQuery);
diff --git a/js/VideoPlayer_intervalEventsConductor.js b/js/VideoPlayer_intervalEventsConductor.js
@@ -17,17 +17,6 @@ https://source.fluidproject.org/svn/LICENSE.txt
 
 (function ($) {
 
-    /*************************************************************************************
-     * The wiring up of the onTick event btw timer component and intervalEventsConductor *
-     *************************************************************************************/
-//    fluid.demands("fluid.videoPlayer.html5MediaTimer", ["fluid.videoPlayer.intervalEventsConductor"], {
-//        options: {
-//            events: {
-//                onTick: "{intervalEventsConductor}.events.onTick"
-//            }
-//        }
-//    });
-
     /*********************************************************************************
      * fluid.videoPlayer.intervalEventsConductor                                     *
      *                                                                               *
@@ -59,7 +48,7 @@ https://source.fluidproject.org/svn/LICENSE.txt
                 args: ["{fluid.videoPlayer.intervalEventsConductor}", "{arguments}.0"]
             }  
         },
-
+        preInitFunction: "fluid.videoPlayer.intervalEventsConductor.preInit",
         // An array of the time intervals with all the begin and end time in millisecond
         // Example: Array[intervalID] = {begin: beginTimeInMilli, end: endTimeInMilli}
         intervalList: [],
@@ -70,8 +59,15 @@ https://source.fluidproject.org/svn/LICENSE.txt
         }
     });
 
+    fluid.videoPlayer.intervalEventsConductor.preInit = function (that) {
+        that.setIntervalList = function (intervalList) {
+            that.setIntervalList(intervalList);
+        };
+    };
+
     fluid.videoPlayer.intervalEventsConductor.setIntervalList = function (that, intervalList) {
         that.options.intervalList = intervalList;
+        console.log("intervalList is set to: " + that.options.intervalList);
     };
 
     fluid.videoPlayer.intervalEventsConductor.inInterval = function (currentTimeInMillis, interval) {

diff --git a/js/VideoPlayer_media.js b/js/VideoPlayer_media.js
@@ -31,15 +31,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             mediaEventBinder: {
                 type: "fluid.videoPlayer.eventBinder",
                 createOnEvent: "onEventBindingReady"
-            },
-            intervalEventsConductor: {
-                type: "fluid.videoPlayer.intervalEventsConductor",
-                createOnEvent: "onEventBindingReady"
-            },
-            transcript: {
-                type: "fluid.videoPlayer.transcript",
-                createOnEvent: "onEventBindingReady"
-            }
+            }//,
+//            intervalEventsConductor: {
+//                type: "fluid.videoPlayer.intervalEventsConductor",
+//                createOnEvent: "onEventBindingReady"
+//            },
+//            transcript: {
+//                type: "fluid.videoPlayer.transcript",
+//                createOnEvent: "onEventBindingReady"
+//            }
         },
         finalInitFunction: "fluid.videoPlayer.media.finalInit",
         preInitFunction: "fluid.videoPlayer.media.preInit",