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
aa5781c1
Commit
aa5781c1
authored
Sep 24, 2014
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5294 from edx/waheed/tnl235-fix-video-transcript-not-follow
Fixed transcript not follow with video on seek.
parents
7e1b4466
ca1da6c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
0 deletions
+25
-0
common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
+20
-0
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+5
-0
No files found.
common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
View file @
aa5781c1
...
@@ -382,6 +382,26 @@ function (VideoPlayer) {
...
@@ -382,6 +382,26 @@ function (VideoPlayer) {
},
'video didn
\'
t start playing'
,
WAIT_TIMEOUT
);
},
'video didn
\'
t start playing'
,
WAIT_TIMEOUT
);
});
});
it
(
'call runTimer in seekTo on player'
,
function
()
{
runs
(
function
()
{
spyOn
(
state
.
videoPlayer
,
'stopTimer'
);
spyOn
(
state
.
videoPlayer
,
'runTimer'
);
state
.
videoPlayer
.
seekTo
(
10
);
});
waitsFor
(
function
()
{
return
state
.
videoPlayer
.
currentTime
>=
10
;
},
'currentTime is less than 10 seconds'
,
WAIT_TIMEOUT
);
runs
(
function
()
{
expect
(
state
.
videoPlayer
.
stopTimer
)
.
toHaveBeenCalled
();
expect
(
state
.
videoPlayer
.
runTimer
)
.
toHaveBeenCalled
();
});
});
// as per TNL-439 this test is deemed flaky and needs to be fixed.
// as per TNL-439 this test is deemed flaky and needs to be fixed.
// disabled 09/18/2014
// disabled 09/18/2014
xit
(
'slider event causes log update'
,
function
()
{
xit
(
'slider event causes log update'
,
function
()
{
...
...
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
View file @
aa5781c1
...
@@ -489,6 +489,11 @@ function (HTML5Video, Resizer) {
...
@@ -489,6 +489,11 @@ function (HTML5Video, Resizer) {
this
.
videoPlayer
.
updatePlayTime
(
time
,
true
);
this
.
videoPlayer
.
updatePlayTime
(
time
,
true
);
this
.
el
.
trigger
(
'seek'
,
arguments
);
this
.
el
.
trigger
(
'seek'
,
arguments
);
// the timer is stopped above; restart it.
if
(
this
.
videoPlayer
.
isPlaying
())
{
this
.
videoPlayer
.
runTimer
();
}
}
}
function
runTimer
()
{
function
runTimer
()
{
...
...
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