FLUID-4786: Convey menu and transcrip to menu component, start cleani…

…ng up; need to move stuff into demands blocks
michelled · Sep 26, 2012 · 10bde2e · 10bde2e
1 parent e315dfe
commit 10bde2e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 70 deletions.
diff --git a/js/MenuButton.js b/js/MenuButton.js
@@ -40,8 +40,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         events: {
             onReady: null,
             activated: null,
-            hiddenByKeyboard: null
+            hiddenByKeyboard: null,
+            onControlledElementReady: null
         },
+listeners: {
+    onControlledElementReady: function (theLangMenu, theTranscriptComp) {
+        console.log("in languageMenu onControlledElementReady handler: : theLangMenu = "+theLangMenu.typeName+", theTranscriptComp: "+theTranscriptComp.typeName);
+        fluid.videoPlayer.languageControls.updateAriaControls(theLangMenu, theTranscriptComp)
+    }
+},
         selectors: {
             menuItem: ".flc-videoPlayer-menuItem",
             language: ".flc-videoPlayer-language",
@@ -222,11 +229,15 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         events: {
             onReady: null,
             onRenderingComplete: null,
-            onControlledElementReady: null
+            onControlledElementReady: null,
+            boiledOnControlledElementReady: {
+                event: "onControlledElementReady",
+                args: ["{languageControls}.menu", "{arguments}.1"]
+            }
         },
 listeners: {
     onControlledElementReady: function (theLangCtrls, theTranscriptComp) {
-        console.log("in menuButton onControlledElementReady handler: : theLangCtrls = "+theLangCtrls.typeName+", theTranscriptComp: "+theTranscriptComp.typeName);
+        console.log("in languageControls onControlledElementReady handler: : theLangCtrls = "+theLangCtrls.typeName+", theTranscriptComp: "+theTranscriptComp.typeName);
         fluid.videoPlayer.languageControls.updateAriaControls(theLangCtrls, theTranscriptComp)
     }
 },
@@ -267,7 +278,10 @@ listeners: {
                     showHidePath: "{languageControls}.options.showHidePath",
                     currentLanguagePath: "{languageControls}.options.currentLanguagePath",
                     strings: "{languageControls}.options.strings",
-                    controlledEl: "{languageControls}.options.controlledEl"
+                    controlledEl: "{languageControls}.options.controlledEl",
+                    events: {
+                        onControlledElementReady: "{languageControls}.events.boiledOnControlledElementReady"
+                    }
                 }
             },
             eventBinder: {
@@ -348,7 +362,7 @@ listeners: {
 
 
     fluid.videoPlayer.languageControls.updateAriaControls = function (transcriptControls, transcriptComponent) {
-        debugger;
+//        debugger;
 //        that.menu.attr("aria-controls", transcriptEl.id);
     };
 })(jQuery);

diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
@@ -197,12 +197,6 @@ transcriptMenuEventBinder: {
     type: "fluid.videoPlayer.eventBinder",
     createOnEvent: "canBindTranscriptMenu"
 },
-/*
-transcriptMenuBinder: {
-    type: "fluid.videoPlayer.transcriptMenuBinder.finalInit",
-    createOnEvent: "canBindTranscriptMenu"
-},
-*/
             browserCompatibility: {
                 type: "demo.html5BackwardsCompatability",
                 createOnEvent: "onOldBrowserDetected"
@@ -261,23 +255,8 @@ canBindTranscriptMenu: {
         transcripts: "onTranscriptsReady"
     },
     args: ["{arguments}.controllers.0", "{arguments}.transcripts.0"]
-/*
-},
-boiledCanBindTranscriptMenu: {
-    event: "canBindTranscriptMenu"
-*/
 }
             },
-/*
-listeners: {
-    canBindTranscriptMenu: function (controllers, transcripts) {
-        console.log("canBindTranscriptMenu handler: controllers = "+controllers.typeName+", transcripts: "+transcripts.typeName);
-        },
-    boiledCanBindTranscriptMenu: function (controllers, transcripts) {
-        console.log("boiliedCanBindTranscriptMenu handler: controllers = "+controllers.typeName+", transcripts: "+transcripts.typeName);
-        }
-},
-*/
         invokers: {
             resize: {
                 funcName: "fluid.videoPlayer.resize",
@@ -693,48 +672,4 @@ listeners: {
             }
         }
     });
-
-
-
-/*
-    fluid.videoPlayer.addAriaControlsToTranscriptMenu = function (that) {
-        console.log("in fluid.videoPlayer.addAriaControlsToTranscriptMenu(): that = "+that);
-    };
-// NB: the transcriptMenuEventBinder is not binding events anymore - not sure if it's even being used at all?
-    fluid.demands("transcriptMenuEventBinder", ["fluid.videoPlayer.transcript", "fluid.videoPlayer"], {
-        options: {
-            listeners: {
-                "{videoPlayer}.events.canBindTranscriptMenu": function () {
-                    console.log("in canBindTranscriptMenu handler");
-                }
-            }
-        }
-    });
-*/
-/*
-    fluid.demands("fluid.videoPlayer.transcript", "fluid.videoPlayer", {
-        options: {
-            events: {
-                boiledOnTranscriptsLoaded: "{transcript}.events.onTranscriptsLoaded"
-            },
-            listeners: {
-                "boiledOnTranscriptsLoaded": fluid.videoPlayer.addAriaControlsToTranscriptMenu
-            }
-        }
-    });
-    fluid.demands("boiledOnTranscriptsLoaded", ["fluid.videoPlayer.transcript", "fluid.videoPlayer"],  ["42"]);
-*/
-
-    /************
-     * 
-     ************/
-/*
-    fluid.defaults("fluid.videoPlayer.transcriptMenuBinder", {
-        gradeNames: ["fluid.eventedComponent", "autoInit"],
-        finalInitFunction: "fluid.videoPlayer.transcriptMenuBinder.finalInit"
-    });
-    fluid.videoPlayer.transcriptMenuBinder.finalInit = function (that) {
-        console.log("in transcriptMenuBinder.finalInit")
-    };
-*/
 })(jQuery);