Merge remote-tracking branch 'upstream/master' into FLUID-4837

michelled · Nov 9, 2012 · f73cf18 · f73cf18
2 parents e3ae830 + 7b26174
commit f73cf18
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/js/MenuButton.js b/js/MenuButton.js
@@ -210,6 +210,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         fluid.videoPlayer.languageMenu.setUpKeyboardA11y(that);
 
         that.container.attr("role", "menu");
+        that.container.css("z-index", 9999);
         that.hideMenu();
         that.updateTracks();
         that.updateShowHide();

diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
@@ -617,7 +617,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
         // Set height on the controller area. To make overlay to show up exactly at the bottom of the video regardless to UIO settings
         videoPlayer.css({height: videoHeight});
-        videoPlayer.css({width: videoWidth}); // Ensures the video and overlay will always be the same width (for ex., coming out of full-screen)
 
         // Set the width of the overlay to be the width of the video, otherwise, the controller bar spreads into transcript area
         overlay.css({width: videoWidth});

diff --git a/js/VideoPlayer_transcript.js b/js/VideoPlayer_transcript.js
@@ -171,7 +171,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         var inTimeMillis;
         if (track.text) {
             // this is a Universal Subtitles format file
-            inTimeMillis = that.convertSecsToMilli(track.start_time);
+            inTimeMillis = track.start_time;
         } else {
             // a WebVTT compatible json format file
             inTimeMillis = that.convertToMilli(track.inTime);

diff --git a/tests/js/TestUtils.js b/tests/js/TestUtils.js
@@ -78,7 +78,8 @@ fluid.registerNamespace("fluid.testUtils");
 
     fluid.testUtils.initEnhancedVideoPlayer = function (instance, relay) {
         var opts = fluid.copy(baseOpts);
-        $.extend(true, instance.options, opts);
+        $.extend(true, opts, instance.options);
+        instance.options = opts;
         return fluid.videoPlayer.makeEnhancedInstances(instance, relay);
     };
 

diff --git a/tests/js/VideoPlayerTranscriptIntegrationTests.js b/tests/js/VideoPlayerTranscriptIntegrationTests.js
@@ -62,5 +62,45 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             fluid.testUtils.initEnhancedVideoPlayer(instance, uiOptions.relay);
         });
 
+        videoPlayerTranscriptIntegrationTests.asyncTest("Scrubbing", function () {
+            var vp;
+            var newTime = 0;
+            var instance = {
+                container: ".videoPlayer-transcript",
+                options: {
+                    video: {
+                        transcripts: [{
+                            src: "http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
+                            type: "text/amarajson"
+                        }]
+                    },
+                    templates: {
+                        videoPlayer: {
+                            href: "../../html/videoPlayer_template.html"
+                        }
+                    },
+                    listeners: {
+                        onReady: function (that) {
+                            vp = that;
+                        },
+                        onTranscriptsLoaded: function (intervalList, transcriptTextId, that) {
+                            var anElement = $($("[id^=flc-videoPlayer-transcript-element]")[7]);
+                            newTime = (that.options.transcripts[0].tracks[7].start_time + 1) / 1000;
+                            anElement.click();
+                        },
+                        onTimeChange: {
+                            listener: function (currTime, buffered) {
+                                jqUnit.assertEquals("New time is same as clicked transcript", newTime, currTime);
+                                vp.events.onTimeChange.removeListener("timeChecker");
+                                start();
+                            },
+                            namespace: "timeChecker"
+                        }
+                    }
+                }
+            };
+            fluid.testUtils.initEnhancedVideoPlayer(instance, uiOptions.relay);
+        });
+
     });
 })(jQuery);