Merge branch 'master' into FLUID-4826

fluid-project · Jan 29, 2013 · 4d17780 · 4d17780
2 parents a577724 + 8d7f6a2
commit 4d17780
Show file tree

Hide file tree

Showing 4 changed files with 163 additions and 134 deletions.
diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
@@ -190,14 +190,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     captions: "{videoPlayer}.options.video.captions",
                     transcripts: "{videoPlayer}.options.video.transcripts",
                     events: {
-                        // TODO: Once FLUID-4879 is addressed, handling of the controllers ready event will need to be updated
-                        onReady: "{videoPlayer}.events.onControllersReady",
                         onStartScrub: "{videoPlayer}.events.onStartScrub",
                         onScrub: "{videoPlayer}.events.onScrub",
                         afterScrub: "{videoPlayer}.events.afterScrub",
                         onTranscriptsReady: "{videoPlayer}.events.canBindTranscriptMenu",
                         onCaptionsReady: "{videoPlayer}.events.canBindCaptionMenu"
                     },
+                    listeners: {
+                        onReady: "{videoPlayer}.events.onControllersReady",
+                    },
                     templates: {
                         menuButton: "{videoPlayer}.options.templates.menuButton"
                     }
@@ -235,9 +236,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             onTranscriptShow: null,
             onTranscriptElementChange: null,
 
-            // main VideoPlayer is not 'ready' until the controllers are ready
             onReady: {
-                event: "onControllersReady",
+                events: {
+                    onTemplateReady: "onTemplateReady",
+                    onControllersReady: "onControllersReady",
+                    onCreate: "onCreate"
+                },
                 args: ["{videoPlayer}"]
             },
 

diff --git a/js/VideoPlayer_controllers.js b/js/VideoPlayer_controllers.js
@@ -48,8 +48,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     events: {
                         onScrub: "{controllers}.events.onScrub",
                         afterScrub: "{controllers}.events.afterScrub",
-                        onStartScrub: "{controllers}.events.onStartScrub",
-                        onScrubberReady: "{controllers}.events.onScrubberReady"
+                        onStartScrub: "{controllers}.events.onStartScrub"
+                    },
+                    listeners: {
+                        onReady: "{controllers}.events.onScrubberReady"
                     }
                 }
             },
@@ -59,15 +61,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 options: {
                     model: "{controllers}.model",
                     applier: "{controllers}.applier",
-                    events: {
+                    listeners: {
                         onReady: "{controllers}.events.onVolumeReady"
                     }
                 }
             },
             captionControls: {
                 type: "fluid.emptyEventedSubcomponent",
                 options: {
-                    events: {
+                    listeners: {
                         onReady: "{controllers}.events.onCaptionControlsReady"
                     }
                 }
@@ -137,7 +139,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 }
             }
         },
-        postInitFunction: "fluid.videoPlayer.controllers.postInit",
         finalInitFunction: "fluid.videoPlayer.controllers.finalInit",
         events: {
             onStartTimeChange: null,
@@ -158,19 +159,17 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             onCaptionControlsReady: null,
             onTranscriptControlsReady: null,
             onFullScreenReady: null,
-            // TODO: onReady should be the aggregate event, but not working now - see http://issues.fluidproject.org/browse/FLUID-4879
-            // Once FLUID-4879 is addressed, this should be updated
-            onControllersReady: {
+            onReady: {
                 events: {
                     playReady: "onPlayReady",
                     volumeReady: "onVolumeReady",
                     scrubReady: "onScrubberReady",
                     captionControlsReady: "onCaptionControlsReady",
                     transcriptControlsReady: "onTranscriptControlsReady",
                     fullScreenReady: "onFullScreenReady"
-                }
-            },
-            onReady: null
+                },
+                args: ["{controllers}"]
+            }
         },
 
         selectors: {
@@ -250,14 +249,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         args: ["{controllers}.dom.captionControlsContainer", captionControlsOptions]
     });
 
-    fluid.videoPlayer.controllers.postInit = function (that) {
-        // TODO: onReady should fire automatically, but not working now - see http://issues.fluidproject.org/browse/FLUID-4879
-        // Once FLUID-4879 is addressed, this will not be necessary
-        that.events.onControllersReady.addListener(function () {
-            that.events.onReady.fire(that);
-        });
-    };
-
     fluid.videoPlayer.controllers.finalInit = function (that) {
         bindControllerModel(that);
     };
@@ -341,15 +332,25 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 container: "{scrubber}.dom.bufferedProgress",
                 options: {
                     initiallyHidden: false,
-                    minWidth: 0
+                    minWidth: 0,
+                    listeners: {
+                        onAttach: "{scrubber}.events.onProgressAttached"
+                    }
                 }
             }
         },
         events: {
             afterScrub: null,
             onScrub: null,
-            onScrubberReady: null,
-            onStartScrub: null
+            onStartScrub: null,
+            onProgressAttached: null,
+            onReady: {
+                events: {
+                    onProgressAttached: "onProgressAttached",
+                    onCreate: "onCreate"
+                },
+                args: ["{scrubber}"]
+            }
         },
         invokers: {
             updateBuffered: {
@@ -436,8 +437,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         createScrubberMarkup(that);
         bindScrubberDOMEvents(that);
         bindScrubberModel(that);
-
-        that.events.onScrubberReady.fire();
     };
 
 
@@ -565,7 +564,14 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         postInitFunction: "fluid.videoPlayer.volumeControls.postInit",
         finalInitFunction: "fluid.videoPlayer.volumeControls.finalInit",
         events: {
-            onReady: null
+            muteButtonReady: null,
+            onReady: {
+                events: {
+                    muteButtonReady: "muteButtonReady",
+                    onCreate: "onCreate"
+                },
+                args: ["{volumeControls}"]
+            }
         },
         model: {
             muted: false,
@@ -612,7 +618,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         tooltip: {
                             container: "{volumeControls}.container"
                         }
-                    }
+                    },
+                    listeners: {
+                        onReady: "{volumeControls}.events.muteButtonReady"
+                    } 
                 }
             }
         }
@@ -639,8 +648,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         volumeControls.init(that);
         volumeControls.bindDOMEvents(that);
         volumeControls.bindModel(that);
-
-        that.events.onReady.fire(that);
     };
 
     /********************************************************************************
@@ -649,12 +656,13 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     fluid.defaults("fluid.emptyEventedSubcomponent", {
         gradeNames: ["fluid.eventedComponent", "autoInit"],
         events: {
-            onReady: null
-        },
-        finalInitFunction: "fluid.emptyEventedSubcomponent.finalInit"
+            onReady: {
+                events: {
+                    onCreate: "onCreate"
+                },
+                args: ["{emptyEventedSubcomponent}"]
+            }
+        }
     });
-    fluid.emptyEventedSubcomponent.finalInit = function (that) {
-        that.events.onReady.fire();
-    };
 
 })(jQuery);