Skip to content
This repository has been archived by the owner on Dec 10, 2020. It is now read-only.

fix manual tests #154

Merged
merged 1 commit into from
May 11, 2015
Merged

fix manual tests #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions tests/manual/manual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@
}

var flashvars = {
readyFunction: "onSWFReady",
eventProxyFunction: "onSWFEvent",
errorEventProxyFunction: "onSWFErrorEvent",
// readyFunction: "onSWFReady",
// eventProxyFunction: "onSWFEvent",
// errorEventProxyFunction: "onSWFErrorEvent",
src: "",
autoplay: false,
preload: false,
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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() });
Expand Down
16 changes: 11 additions & 5 deletions tests/manual/manual_full.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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");
}

Expand Down Expand Up @@ -256,6 +256,12 @@

}

var videojs = {};
videojs.Flash = {};
videojs.Flash.onEvent = onSWFEvent;
videojs.Flash.onError = onSWFErrorEvent;
videojs.Flash.onReady = onSWFReady;

$(init);

</script>
Expand Down