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
6130189b
Commit
6130189b
authored
Oct 29, 2013
by
polesye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix slider and pause bugs.
parent
389beedc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
17 deletions
+7
-17
common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
+2
-15
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
+5
-2
No files found.
common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
View file @
6130189b
...
...
@@ -210,11 +210,11 @@ function () {
// Attach a 'click' event on the <video> element. It will cause the video to pause/play.
this
.
videoEl
.
on
(
'click'
,
function
(
event
)
{
if
(
_this
.
playerState
===
HTML5Video
.
PlayerState
.
PAUSED
)
{
_this
.
video
.
play
();
_this
.
playVideo
();
_this
.
playerState
=
HTML5Video
.
PlayerState
.
PLAYING
;
_this
.
callStateChangeCallback
();
}
else
if
(
_this
.
playerState
===
HTML5Video
.
PlayerState
.
PLAYING
)
{
_this
.
video
.
pause
();
_this
.
pauseVideo
();
_this
.
playerState
=
HTML5Video
.
PlayerState
.
PAUSED
;
_this
.
callStateChangeCallback
();
}
...
...
@@ -270,19 +270,6 @@ function () {
_this
.
callStateChangeCallback
();
},
false
);
// Register the 'timeupdate' event. This is the place where we control when the video ends.
// If an ending time was specified, then after the video plays through to this spot, pauses, we
// must make sure to update the ending time to the end of the video. This way, the user can watch
// any parts of it afterwards.
this
.
video
.
addEventListener
(
'timeupdate'
,
function
(
data
)
{
if
(
_this
.
end
<
_this
.
video
.
currentTime
)
{
// When we call video.pause(), a 'pause' event will be formed, and we will catch it
// in another handler (see above).
_this
.
video
.
pause
();
_this
.
end
=
_this
.
video
.
duration
;
}
},
false
);
// Place the <video> element on the page.
this
.
videoEl
.
appendTo
(
this
.
el
.
find
(
'.video-player div'
));
}
...
...
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
View file @
6130189b
...
...
@@ -181,13 +181,16 @@ function () {
// Changed for tests -- JM: Check if it is the cause of Chrome Bug Valera
// noticed
function
updatePlayTime
(
params
)
{
var
time
=
Math
.
floor
(
params
.
time
),
duration
=
Math
.
floor
(
params
.
duration
);
if
(
(
this
.
videoProgressSlider
.
slider
)
&&
(
!
this
.
videoProgressSlider
.
frozen
)
)
{
this
.
videoProgressSlider
.
slider
.
slider
(
'option'
,
'max'
,
params
.
duration
)
.
slider
(
'option'
,
'value'
,
params
.
time
);
.
slider
(
'option'
,
'max'
,
duration
)
.
slider
(
'option'
,
'value'
,
time
);
}
}
...
...
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