From 21a9446b9936431cf0483f07d9572a476667f395 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Wed, 25 Sep 2013 11:33:48 +0800
Subject: [PATCH] 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 3dc675b4c25..446111ffeee 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');
--
GitLab