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

Fixing JS.

Browse Source 
There were previous merge conflicts in the file.
This commit is contained in:
Valera Rozuvan
2013-10-03 16:42:19 +03:00
parent 55fde6e5a7
commit 05eb13f086
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/lib/xmodule/xmodule/js/src/video/09_video_caption.js
View File

@@ -165,11 +165,16 @@ function () {
'scroll', this.videoControl.showControls
);
} else if (!this.config.autohideHtml5) {
// this.videoCaption.subtitlesEl.on('mousemove', this.videoCaption.autoShowCaptions);
this.videoCaption.subtitlesEl.on('keydown', this.videoCaption.autoShowCaptions);
this.videoCaption.subtitlesEl.on(
'keydown', this.videoCaption.autoShowCaptions
);
this.videoCaption.hideSubtitlesEl.on('mousemove', this.videoCaption.autoShowCaptions);
this.videoCaption.hideSubtitlesEl.on('keydown', this.videoCaption.autoShowCaptions);
this.videoCaption.hideSubtitlesEl.on(
'mousemove', this.videoCaption.autoShowCaptions
);
this.videoCaption.hideSubtitlesEl.on(
'keydown', this.videoCaption.autoShowCaptions
);
// Moving slider on subtitles is not a mouse move,
// but captions should not be auto-hidden.