From 05eb13f0866448c9e8e584d5bfcfae0d8921eeca Mon Sep 17 00:00:00 2001 From: Valera Rozuvan Date: Thu, 3 Oct 2013 16:42:19 +0300 Subject: [PATCH] Fixing JS. There were previous merge conflicts in the file. --- .../xmodule/js/src/video/09_video_caption.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js index d1f3cf071f..ef70127ccf 100644 --- a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js +++ b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js @@ -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.