Commit 739b0e4b by David Ormsbee

Merge pull request #583 from MITx/rocha/master

[#35065403] Lets video player work if subtitles cannot be loaded
parents ff8ea927 13453898
class @VideoCaption extends Subview class @VideoCaption extends Subview
initialize: ->
@loaded = false
bind: -> bind: ->
$(window).bind('resize', @resize) $(window).bind('resize', @resize)
@$('.hide-subtitles').click @toggle @$('.hide-subtitles').click @toggle
...@@ -24,6 +27,8 @@ class @VideoCaption extends Subview ...@@ -24,6 +27,8 @@ class @VideoCaption extends Subview
@captions = captions.text @captions = captions.text
@start = captions.start @start = captions.start
@loaded = true
if onTouchBasedDevice() if onTouchBasedDevice()
$('.subtitles li').html "Caption will be displayed when you start playing the video." $('.subtitles li').html "Caption will be displayed when you start playing the video."
else else
...@@ -47,6 +52,7 @@ class @VideoCaption extends Subview ...@@ -47,6 +52,7 @@ class @VideoCaption extends Subview
@rendered = true @rendered = true
search: (time) -> search: (time) ->
if @loaded
min = 0 min = 0
max = @start.length - 1 max = @start.length - 1
...@@ -56,17 +62,19 @@ class @VideoCaption extends Subview ...@@ -56,17 +62,19 @@ class @VideoCaption extends Subview
max = index - 1 max = index - 1
if time >= @start[index] if time >= @start[index]
min = index min = index
return min return min
play: -> play: ->
if @loaded
@renderCaption() unless @rendered @renderCaption() unless @rendered
@playing = true @playing = true
pause: -> pause: ->
if @loaded
@playing = false @playing = false
updatePlayTime: (time) -> updatePlayTime: (time) ->
if @loaded
# This 250ms offset is required to match the video speed # This 250ms offset is required to match the video speed
time = Math.round(Time.convert(time, @currentSpeed, '1.0') * 1000 + 250) time = Math.round(Time.convert(time, @currentSpeed, '1.0') * 1000 + 250)
newIndex = @search time newIndex = @search time
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment