From 21a9446b9936431cf0483f07d9572a476667f395 Mon Sep 17 00:00:00 2001 From: Shiwen Cheng Date: Wed, 25 Sep 2013 11:33:48 +0800 Subject: [PATCH 1/3] fix the bug that the first caption and the second one will become current at the same time when displaying right captions --- .../lib/xmodule/xmodule/js/src/video/09_video_caption.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 3dc675b4c2..446111ffee 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 @@ -453,6 +453,9 @@ function () { min = 0; max = this.videoCaption.start.length - 1; + if (time < this.videoCaption.start[min]) { + return -1; + } while (min < max) { index = Math.ceil((max + min) / 2); @@ -507,10 +510,11 @@ function () { newIndex = this.videoCaption.search(time); if ( - newIndex !== void 0 && + typeof newIndex !== 'undefined' && + newIndex !== -1 && this.videoCaption.currentIndex !== newIndex ) { - if (this.videoCaption.currentIndex) { + if (typeof this.videoCaption.currentIndex !== 'undefined') { this.videoCaption.subtitlesEl .find('li.current') .removeClass('current'); From 77f3e4f96479b92b5de6556e622e3e1e7f2b5c99 Mon Sep 17 00:00:00 2001 From: Shiwen Cheng Date: Fri, 27 Sep 2013 18:43:39 +0800 Subject: [PATCH 2/3] fix the bug: when click a caption, the previous one will be in bold --- common/lib/xmodule/xmodule/js/src/video/09_video_caption.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 446111ffee..ff5455c70c 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 @@ -500,11 +500,11 @@ function () { // Total play time changes with speed change. Also there is // a 250 ms delay we have to take into account. time = Math.round( - Time.convert(time, this.speed, '1.0') * 1000 + 250 + Time.convert(time, this.speed, '1.0') * 1000 + 150 ); } else { // Total play time remains constant when speed changes. - time = Math.round(parseInt(time, 10) * 1000); + time = Math.round(parseInt(time, 10) * 1000 + 150); } newIndex = this.videoCaption.search(time); From 522cb8b48c15abd82512f38cd97fda3bffe20e3f Mon Sep 17 00:00:00 2001 From: Shiwen Cheng Date: Fri, 27 Sep 2013 21:52:54 +0800 Subject: [PATCH 3/3] fix the video caption lag issue --- common/lib/xmodule/xmodule/js/src/video/09_video_caption.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ff5455c70c..a78e08d648 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 @@ -500,11 +500,11 @@ function () { // Total play time changes with speed change. Also there is // a 250 ms delay we have to take into account. time = Math.round( - Time.convert(time, this.speed, '1.0') * 1000 + 150 + Time.convert(time, this.speed, '1.0') * 1000 + 100 ); } else { // Total play time remains constant when speed changes. - time = Math.round(parseInt(time, 10) * 1000 + 150); + time = Math.round(time * 1000 + 100); } newIndex = this.videoCaption.search(time);