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
5b1b73cb
Commit
5b1b73cb
authored
Aug 16, 2013
by
Jay Zoldak
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #702 from edx/peter-fogg/fix-captions-sync
Correctly seek in captions with non-1.0 speeds.
parents
6bc8d327
a5a6d2d5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
+15
-2
No files found.
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
View file @
5b1b73cb
...
...
@@ -443,7 +443,7 @@
});
it
(
'trigger seek event with the correct time'
,
function
()
{
expect
(
videoPlayer
.
currentTime
).
toEqual
(
1
5
);
expect
(
videoPlayer
.
currentTime
).
toEqual
(
1
4.91
);
});
});
...
...
@@ -455,7 +455,20 @@
});
it
(
'trigger seek event with the correct time'
,
function
()
{
expect
(
videoPlayer
.
currentTime
).
toEqual
(
15
);
expect
(
videoPlayer
.
currentTime
).
toEqual
(
14.91
);
});
});
describe
(
'when the player type is Flash at speed 0.75x'
,
function
()
{
beforeEach
(
function
()
{
initialize
();
videoSpeedControl
.
currentSpeed
=
'0.75'
;
state
.
currentPlayerMode
=
'flash'
;
$
(
'.subtitles li[data-start="14910"]'
).
trigger
(
'click'
);
});
it
(
'trigger seek event with the correct time'
,
function
()
{
expect
(
videoPlayer
.
currentTime
).
toEqual
(
15
);
});
});
});
...
...
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