FLUID-4839: Fixed an error being thrown in the mammals demo. Styling …

…tweaks.
michelled · Nov 28, 2012 · bf52850 · bf52850
1 parent 2a38f6e
commit bf52850
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/demos/Mammals.css b/demos/Mammals.css
@@ -188,6 +188,7 @@ footer a {
     margin-bottom: 1em;
     text-align: center;
     max-width: 100%;
+    height: 31.25em;
 }
 
 
@@ -196,7 +197,6 @@ footer a {
     background-color: #808080;
 }
 
-.fl-videoPlayer-video {
-    width: 500px;
-    height: 500px;
+.fl-videoPlayer-video-element, .fl-videoPlayer-overlay {
+    width: 31.25em;
 }
diff --git a/demos/Mammals.js b/demos/Mammals.js
@@ -62,7 +62,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         },
                         {
                             src: "http://www.youtube.com/v/0jw74pfWfxA",
-                            type: "youtube"
+                            type: "video/youtube"
                         }
                     ],
                     captions: [
@@ -111,7 +111,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         },
                         {
                             src: "http://www.youtube.com/v/h_oHNP50FGM",
-                            type: "youtube"
+                            type: "video/youtube"
                         }
                     ],
                     captions: [
@@ -152,17 +152,17 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 videoTitle: "Polar Mammal Adaptation",
                 video: {
                     sources: [
-                        {
-                            src: "videos/PolarMammalAdaptations/PolarMammalAdaptations.mp4",
-                            type: "video/mp4"
-                        }, 
-                        {
-                            src: "videos/PolarMammalAdaptations/PolarMammalAdaptations.webm",
-                            type: "video/webm"
-                        },
+                        // {
+                        //     src: "videos/PolarMammalAdaptations/PolarMammalAdaptations.mp4",
+                        //     type: "video/mp4"
+                        // }, 
+                        // {
+                        //     src: "videos/PolarMammalAdaptations/PolarMammalAdaptations.webm",
+                        //     type: "video/webm"
+                        // },
                         {
                             src: "http://www.youtube.com/v/3_3p2ylZDAE",
-                            type: "youtube"
+                            type: "video/youtube"
                         }
                     ],
                     captions: [

diff --git a/demos/VideoPlayer.html b/demos/VideoPlayer.html
@@ -81,14 +81,14 @@ <h1>Infusion HTML 5 Video Player</h1>
             var videoOptions = {container: ".videoPlayer", options: {
                 video: {
                     sources: [
-                        // {
-                        //     src: "videos/ReorganizeFuture/ReorganizeFuture.mp4",
-                        //     type: "video/mp4"
-                        // },
-                        // {
-                        //     src: "videos/ReorganizeFuture/ReorganizeFuture.webm",
-                        //     type: "video/webm"
-                        // },
+                        {
+                            src: "videos/ReorganizeFuture/ReorganizeFuture.mp4",
+                            type: "video/mp4"
+                        },
+                        {
+                            src: "videos/ReorganizeFuture/ReorganizeFuture.webm",
+                            type: "video/webm"
+                        },
                         {
                             src: "http://www.youtube.com/v/_VxQEPw1x9E",
                             type: "video/youtube"

diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
@@ -250,12 +250,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 args: ["{arguments}.captions.1"]
             }
         },
-        invokers: {
-            resize: {
-                funcName: "fluid.videoPlayer.resize",
-                args: "{videoPlayer}"
-            }  
-        },
         selectors: {
             videoPlayer: ".flc-videoPlayer-main",
             video: ".flc-videoPlayer-video",
@@ -410,8 +404,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         });
 
         that.events.onLoadedMetadata.addListener(function () {
-            that.resize();
-
             bindKeyboardControl(that);
         });
     };