Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10866 from edx/clrux/ac-245

Browse Source 
Fix: correcting play/skip icon for bumper
This commit is contained in:
clrux
2015-12-07 15:04:42 -05:00
parent ad95413c79 4161ae9980
commit 10d2e81833
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js
View File

@@ -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();

7
common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js
View File

@@ -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');

8
common/lib/xmodule/xmodule/js/src/video/09_play_skip_control.js
View File

@@ -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.