Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
79f11de6
Commit
79f11de6
authored
Oct 18, 2013
by
polesye
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug
Video player: Fix multi speed bug
parents
9df72360
df091e50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
24 deletions
+1
-24
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+1
-19
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+0
-5
No files found.
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View file @
79f11de6
...
...
@@ -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)
...
...
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
View file @
79f11de6
...
...
@@ -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".'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment