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

Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug

Browse Source 
Video player: Fix multi speed bug
This commit is contained in:
polesye
2013-10-18 08:09:42 -07:00
parent 9df7236065 df091e5023
commit 79f11de6de
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View File

@@ -138,25 +138,7 @@ function (VideoPlayer) {
// support HTML5. When we have this setting in cookies, we can select
// the proper mode from the start (not having to change mode later on).
function _setPlayerMode(state) {
(function (currentPlayerMode) {
if (
(currentPlayerMode === 'html5') ||
(currentPlayerMode === 'flash')
) {
state.currentPlayerMode = currentPlayerMode;
} else {
$.cookie('current_player_mode', 'html5', {
expires: 3650,
path: '/'
});
state.currentPlayerMode = 'html5';
}
console.log(
'[Video info]: YouTube player mode is "' +
state.currentPlayerMode + '".'
);
}($.cookie('current_player_mode')));
state.currentPlayerMode = 'html5';
}
// function _parseYouTubeIDs(state)

5
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
View File

@@ -146,11 +146,6 @@ function (HTML5Video, Resizer) {
// Remove from the page current iFrame with HTML5 video.
state.videoPlayer.player.destroy();
// Remember for future page loads that we should use Flash mode.
$.cookie('current_player_mode', 'flash', {
'expires': 3650,
'path': '/'
});
state.currentPlayerMode = 'flash';
console.log('[Video info]: Changing YouTube player mode to "flash".');