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
10d2e818
Commit
10d2e818
authored
Dec 07, 2015
by
clrux
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10866 from edx/clrux/ac-245
Fix: correcting play/skip icon for bumper
parents
ad95413c
4161ae99
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
17 deletions
+4
-17
common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
+0
-6
common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
+0
-7
common/lib/xmodule/xmodule/js/src/video/09_play_skip_control.js
+4
-4
No files found.
common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
View file @
10d2e818
...
...
@@ -25,12 +25,6 @@
expect
(
$
(
'.video_control.play'
)).
toExist
();
});
it
(
'add ARIA attributes to play control'
,
function
()
{
expect
(
$
(
'.video_control.play'
)).
toHaveAttrs
({
'aria-disabled'
:
'false'
});
});
it
(
'can update state on play'
,
function
()
{
state
.
el
.
trigger
(
'play'
);
expect
(
$
(
'.video_control.play'
)).
not
.
toExist
();
...
...
common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
View file @
10d2e818
...
...
@@ -30,13 +30,6 @@
expect
(
$
(
'.skip-control'
)).
toExist
();
});
it
(
'add ARIA attributes to play control'
,
function
()
{
state
.
el
.
trigger
(
'play'
);
expect
(
$
(
'.skip-control'
)).
toHaveAttrs
({
'aria-disabled'
:
'false'
});
});
it
(
'can skip the video on click'
,
function
()
{
spyOn
(
state
.
bumperState
.
videoBumper
,
'skipAndDoNotShowAgain'
);
state
.
el
.
trigger
(
'play'
);
...
...
common/lib/xmodule/xmodule/js/src/video/09_play_skip_control.js
View file @
10d2e818
...
...
@@ -25,9 +25,9 @@ define('video/09_play_skip_control.js', [], function() {
PlaySkipControl
.
prototype
=
{
template
:
[
'<button class="control video_control play play-skip-control"
aria-disabled="false"
>'
,
'<button class="control video_control play play-skip-control">'
,
'<span class="icon-fallback-img">'
,
'<span class="icon
icon
-play" aria-hidden="true"></span>'
,
'<span class="icon
fa fa
-play" aria-hidden="true"></span>'
,
'<span class="text control-text">'
,
gettext
(
'Play'
),
'</span>'
,
...
...
@@ -79,8 +79,8 @@ define('video/09_play_skip_control.js', [], function() {
.
removeClass
(
'play'
)
.
addClass
(
'skip'
)
.
find
(
'.icon'
)
.
removeClass
(
'
icon
-play'
)
.
addClass
(
'
icon
-step-forward'
)
.
removeClass
(
'
fa
-play'
)
.
addClass
(
'
fa
-step-forward'
)
.
find
(
'.control-text'
)
.
text
(
gettext
(
'Skip'
));
// Disable possibility to pause the video.
...
...
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