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

Added support for time line in HTML5.

Browse Source
This commit is contained in:
Valera Rozuvan
2013-01-31 13:24:17 +02:00
parent 067f2e97f5
commit 80fa9d0116
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js
View File

@@ -113,50 +113,34 @@ this.HTML5Video = (function () {
this.video = this.videoEl[0];
this.video.addEventListener('canplay', function () {
console.log('We got a "canplay" event.');
_this.playerState = HTML5Video.PlayerState.PAUSED;
if ($.isFunction(_this.config.events.onReady) === true) {
console.log('Callback function "onReady" is defined.');
_this.config.events.onReady({});
}
}, false);
this.video.addEventListener('play', function () {
console.log('We got a "play" event.');
_this.playerState = HTML5Video.PlayerState.PLAYING;
if ($.isFunction(_this.config.events.onStateChange) === true) {
console.log('Callback function "onStateChange" is defined.');
_this.config.events.onStateChange({
'data': _this.playerState
});
}
}, false);
this.video.addEventListener('pause', function () {
console.log('We got a "pause" event.');
_this.playerState = HTML5Video.PlayerState.PAUSED;
if ($.isFunction(_this.config.events.onStateChange) === true) {
console.log('Callback function "onStateChange" is defined.');
_this.config.events.onStateChange({
'data': _this.playerState
});
}
}, false);
this.video.addEventListener('ended', function () {
console.log('We got a "ended" event.');
_this.playerState = HTML5Video.PlayerState.ENDED;
if ($.isFunction(_this.config.events.onStateChange) === true) {
console.log('Callback function "onStateChange" is defined.');
_this.config.events.onStateChange({
'data': _this.playerState
});
@@ -201,7 +185,6 @@ this.HTML5Video = (function () {
};
Player.prototype.pauseVideo = function () {
console.log('Player.prototype.pauseVideo');
this.video.pause();
};
@@ -237,12 +220,10 @@ this.HTML5Video = (function () {
};
Player.prototype.getCurrentTime = function () {
return this.video.currentTime;
};
Player.prototype.playVideo = function () {
console.log('Player.prototype.playVideo');
this.video.play();
};
@@ -255,9 +236,7 @@ this.HTML5Video = (function () {
};
Player.prototype.getDuration = function () {
// TODO: Return valid video duration.
return 0;
return this.video.duration;
};
return Player;

7
common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee
View File

@@ -171,22 +171,19 @@ class @VideoPlayerAlpha extends SubviewAlpha
# Delegates
play: =>
console.log 'Play clicked'
console.log @player.playVideo
@player.playVideo() if @player.playVideo
isPlaying: ->
@player.getPlayerState() == @PlayerState.PLAYING
pause: =>
console.log 'Pause clicked'
console.log @player.pauseVideo
@player.pauseVideo() if @player.pauseVideo
duration: ->
if @video.videoType is "youtube"
return @video.getDuration()
else return @player.getDuration() if @video.videoType is "html5"
else if @video.videoType is "html5"
return @player.getDuration()
0
currentSpeed: ->