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

Fixed conflicts

Browse Source
This commit is contained in:
Kyle Fiedler
2012-01-27 16:12:11 -05:00
parent ccafe302be 92e5cff869
commit a58d36bff9
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
video.html
View File

@@ -1,42 +1,39 @@
<div class="video-wrapper">
<div class="video-player">
<div id="ytapiplayer">
</div>
<!-- TODO(Ernie/Kyle) move styles to css -->
<iframe id="html5_player" type="text/html" frameborder="0">
</iframe>
</div>
<section class="video-controls">
<ul>
<li><span class="ui-icon ui-icon-play" onclick="play();"></span></li>
<li><span class="ui-icon ui-icon-pause" onclick="pause();"></span></li>
</ul>
<ul>
<li><span class="ui-icon ui-icon-play" onclick="play();"></span></li>
<li><span class="ui-icon ui-icon-pause" onclick="pause();"></span></li>
</ul>
<div id="slider"></div>
<div id="vidtime">0:00/0:00</div>
<div id="video_speeds"></div>
</section>
</div>
<ol class="subtitles">
<li id=stt_n5><div id=std_n7 onclick="title_seek(-7);"></div></li>
<li id=stt_n4><div id=std_n6 onclick="title_seek(-6);"></div></li>
<li id=stt_n4><div id=std_n5 onclick="title_seek(-5);"></div></li>
<li id=stt_n4><div id=std_n4 onclick="title_seek(-4);"></div></li>
<li id=stt_n3><div id=std_n3 onclick="title_seek(-3);"></div></li>
<li id=stt_n2><div id=std_n2 onclick="title_seek(-2);"></div></li>
<li id=stt_n1><div id=std_n1 onclick="title_seek(-1);"></div></li>
<li id=stt_0 class="current"><div id=std_0 onclick="title_seek(0);"></div></li>
<li id=stt_p1><div id=std_p1 onclick="title_seek( 1);"></div></li>
<li id=stt_p2><div id=std_p2 onclick="title_seek( 2);"></div></li>
<li id=stt_p3><div id=std_p3 onclick="title_seek( 3);"></div></li>
<li id=stt_p4><div id=std_p4 onclick="title_seek( 4);"></div></li>
<li id=stt_p5><div id=std_p5 onclick="title_seek( 5);"></div></li>
<li id=stt_p6><div id=std_p7 onclick="title_seek( 6);"></div></li>
<li id=stt_p6><div id=std_p7 onclick="title_seek( 7);"></div></li>
<li id=stt_p6><div id=std_p7 onclick="title_seek( 8);"></div></li>
<li id="stt_n5"><div id="std_n7" onclick="title_seek(-7);"></div></li>
<li id="stt_n4"><div id="std_n6" onclick="title_seek(-6);"></div></li>
<li id="stt_n4"><div id="std_n5" onclick="title_seek(-5);"></div></li>
<li id="stt_n4"><div id="std_n4" onclick="title_seek(-4);"></div></li>
<li id="stt_n3"><div id="std_n3" onclick="title_seek(-3);"></div></li>
<li id="stt_n2"><div id="std_n2" onclick="title_seek(-2);"></div></li>
<li id="stt_n1"><div id="std_n1" onclick="title_seek(-1);"></div></li>
<li id="stt_0 "class="current"><div id="std_0" onclick="title_seek(0);"></div></li>
<li id="stt_p1"><div id="std_p1" onclick="title_seek( 1);"></div></li>
<li id="stt_p2"><div id="std_p2" onclick="title_seek( 2);"></div></li>
<li id="stt_p3"><div id="std_p3" onclick="title_seek( 3);"></div></li>
<li id="stt_p4"><div id="std_p4" onclick="title_seek( 4);"></div></li>
<li id="stt_p5"><div id="std_p5" onclick="title_seek( 5);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 6);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 7);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 8);"></div></li>
</ol>

18
video_init.js
View File

@@ -1,16 +1,16 @@
var streams=${ streams }
var params = { allowScriptAccess: "always", bgcolor: "#cccccc", wmode: "transparent" };
var params = { allowScriptAccess: "always", bgcolor: "#cccccc", wmode: "transparent", allowFullScreen: "true" };
var atts = { id: "myytplayer" };
// If the user doesn't have flash, use the HTML5 Video instead. YouTube's
// iFrame API which supports HTML5 is still developmental so it is not default
// iFrame API which supports HTML5 is still developmental so it is not default
if (swfobject.hasFlashPlayerVersion("10.1")){
swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
"ytapiplayer", "640", "385", "8", null, null, params, atts);
swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
"ytapiplayer", "640", "385", "8", null, null, params, atts);
} else {
//end of this URL may need &origin=http://..... once pushed to production to prevent XSS
$("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1");
$("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0");
$("#html5_player").show();
var tag = document.createElement('script');
@@ -18,6 +18,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){
var firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
// Make sure the callback is called once API ready, YT seems to be buggy
loadHTML5Video();
}
var captions=0;
@@ -25,7 +26,7 @@ $("#slider").slider({slide:function(event,ui){seek_slide('slide',event.originalE
stop:function(event,ui){seek_slide('stop',event.originalEvent,ui.value);}});
function good() {
window['console'].log(ytplayer.getCurrentTime());
window['console'].log(ytplayer.getCurrentTime());
}
ajax_video=good;
@@ -36,8 +37,8 @@ function add_speed(key, stream) {
var id = 'speed_' + stream;
$("#video_speeds").append(' <span id="'+id+'">'+key+'X</span>');
$("#"+id).click(function(){
change_video_speed(key, stream);
});
change_video_speed(key, stream);
});
}
var l=[]
@@ -57,4 +58,3 @@ l.sort(sort_by_value);
for(var i=0; i<l.length; i++) {
add_speed(l[i], streams[l[i]])
}