Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged static-ernie-html5-buttontoggle

Browse Source
This commit is contained in:
Kyle Fiedler
2012-02-15 09:10:58 -05:00
parent 95e463c6ae 2dcdaccb97
commit 1830fb8000
3 changed files with 1885 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2268
css/application.css
View File

File diff suppressed because one or more lines are too long

16
css/print.css
View File

@@ -1,6 +1,10 @@
.header-wrapper {display:none;}
#accordion {display:none;}
.ui-accordion {display:none;
visibility:hidden;
width:0%;
}
.header-wrapper {
display: none; }
#accordion {
display: none; }
.ui-accordion {
display: none;
visibility: hidden;
width: 0%; }

33
js/video_player.js
View File

@@ -196,7 +196,7 @@ function onYouTubePlayerAPIReady() {
'onStateChange': onPlayerStateChange
}
});
updateytplayerInfoInterval = setInterval(updateytplayerInfo, 500);
updateytplayerInfoInterval = setInterval(updateHTML5ytplayerInfo, 200);
ajax_videoInterval = setInterval(ajax_video, 5000);
}
@@ -300,15 +300,32 @@ function onPlayerError(errorCode) {
// alert("An error occured: " + errorCode);
}
function updateytplayerInfo() {
if(ytplayer.getPlayerState()!=3) {
$("#slider").slider("option","max",ytplayer.getDuration());
$("#slider").slider("option","value",ytplayer.getCurrentTime());
// Currently duplicated to check for if video control changed by clicking the video for HTML5
// Hacky b/c of lack of control over YT player
function updateHTML5ytplayerInfo() {
var player_state = getPlayerState();
if(player_state != 3) {
$("#slider").slider("option","max",ytplayer.getDuration());
$("#slider").slider("option","value",ytplayer.getCurrentTime());
}
if (getPlayerState() == 1){
update_captions(getCurrentTime());
if (player_state == 1){
update_captions(getCurrentTime());
}
if (player_state == 1 && $("#video_control").hasClass("play"))
$("#video_control").removeClass().addClass("pause");
else if (player_state == 2 && $("#video_control").hasClass("pause"))
$("#video_control").removeClass().addClass("play");
}
function updateytplayerInfo() {
var player_state = getPlayerState();
if(player_state != 3) {
$("#slider").slider("option","max",ytplayer.getDuration());
$("#slider").slider("option","value",ytplayer.getCurrentTime());
}
if (player_state == 1){
update_captions(getCurrentTime());
}
// updateHTML("videoduration", getDuration());
// updateHTML("videotime", getCurrentTime());
// updateHTML("startbytes", getStartBytes());
@@ -432,4 +449,4 @@ function clearVideo() {
if (ytplayer) {
ytplayer.clearVideo();
}
}
}