Merge pull request #154 from Wellming/master

fix manual tests
videojs · May 11, 2015 · ded2c21 · ded2c21
2 parents 9da5e41 + fd1f993
commit ded2c21
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/tests/manual/manual.html b/tests/manual/manual.html
@@ -117,9 +117,9 @@
         }
 
         var flashvars = {
-          readyFunction: "onSWFReady",
-          eventProxyFunction: "onSWFEvent",
-          errorEventProxyFunction: "onSWFErrorEvent",
+          // readyFunction: "onSWFReady",
+          // eventProxyFunction: "onSWFEvent",
+          // errorEventProxyFunction: "onSWFErrorEvent",
           src: "",
           autoplay: false,
           preload: false,
@@ -150,8 +150,8 @@
           e.preventDefault();
         }
         var el = $("#videoPlayer")[0];
-        el.vjs_setProperty("eventProxyFunction", "onSWFEvent");
-        el.vjs_setProperty("errorEventProxyFunction", "onSWFErrorEvent");
+        // el.vjs_setProperty("eventProxyFunction", "onSWFEvent");
+        // el.vjs_setProperty("errorEventProxyFunction", "onSWFErrorEvent");
       }
 
       function setSource(e){
@@ -243,6 +243,12 @@
 
       }
 
+      var videojs = {};
+      videojs.Flash = {};
+      videojs.Flash.onEvent = onSWFEvent;
+      videojs.Flash.onError = onSWFErrorEvent;
+      videojs.Flash.onReady = onSWFReady;
+
       $(init);
 
       $(window).load(function() { setupAndPlayback() });

diff --git a/tests/manual/manual_full.html b/tests/manual/manual_full.html
@@ -115,9 +115,9 @@
         e.preventDefault();
 
         var flashvars = {
-          readyFunction: "onSWFReady",
-          eventProxyFunction: "onSWFEvent",
-          errorEventProxyFunction: "onSWFErrorEvent",
+          // readyFunction: "onSWFReady",
+          // eventProxyFunction: "onSWFEvent",
+          // errorEventProxyFunction: "onSWFErrorEvent",
           src: "",
           autoplay: false,
           preload: false,
@@ -160,8 +160,8 @@
       function setProperties(e){
         e.preventDefault();
         var el = $("#videoPlayer")[0];
-        el.vjs_setProperty("eventProxyFunction", "onSWFEvent");
-        el.vjs_setProperty("errorEventProxyFunction", "onSWFErrorEvent");
+        // el.vjs_setProperty("eventProxyFunction", "onSWFEvent");
+        // el.vjs_setProperty("errorEventProxyFunction", "onSWFErrorEvent");
         el.vjs_setProperty("poster", "img/testPattern_ussr_480x360.png");
       }
 
@@ -256,6 +256,12 @@
 
       }
 
+      var videojs = {};
+      videojs.Flash = {};
+      videojs.Flash.onEvent = onSWFEvent;
+      videojs.Flash.onError = onSWFErrorEvent;
+      videojs.Flash.onReady = onSWFReady;
+
       $(init);
 
     </script>