diff --git a/static/coffee/spec/helper.coffee b/static/coffee/spec/helper.coffee index 34e03e9d32..3d9537f872 100644 --- a/static/coffee/spec/helper.coffee +++ b/static/coffee/spec/helper.coffee @@ -11,12 +11,8 @@ jasmine.stubbedMetadata = duration: 300 jasmine.stubbedCaption = - start: [0, 10000, 20000, 30000, 40000, 50000, 60000, 70000, 80000, 90000, - 100000, 110000, 120000] - text: ['Caption at 0', 'Caption at 10000', 'Caption at 20000', - 'Caption at 30000', 'Caption at 40000', 'Caption at 50000', 'Caption at 60000', - 'Caption at 70000', 'Caption at 80000', 'Caption at 90000', 'Caption at 100000', - 'Caption at 110000', 'Caption at 120000'] + start: [0, 10000, 20000, 30000] + text: ['Caption at 0', 'Caption at 10000', 'Caption at 20000', 'Caption at 30000'] jasmine.stubRequests = -> spyOn($, 'ajax').andCallFake (settings) -> diff --git a/static/coffee/spec/modules/video/video_caption_spec.coffee b/static/coffee/spec/modules/video/video_caption_spec.coffee index acf900fdcf..e816da593a 100644 --- a/static/coffee/spec/modules/video/video_caption_spec.coffee +++ b/static/coffee/spec/modules/video/video_caption_spec.coffee @@ -9,66 +9,82 @@ describe 'VideoCaption', -> describe 'constructor', -> beforeEach -> spyOn($, 'getWithPrefix').andCallThrough() - @caption = new VideoCaption @player, 'def456' - it 'set the player', -> - expect(@caption.player).toEqual @player + describe 'always', -> + beforeEach -> + @caption = new VideoCaption @player, 'def456' - it 'set the youtube id', -> - expect(@caption.youtubeId).toEqual 'def456' + it 'set the player', -> + expect(@caption.player).toEqual @player - it 'create the caption element', -> - expect($('.video')).toContain 'ol.subtitles' + it 'set the youtube id', -> + expect(@caption.youtubeId).toEqual 'def456' - it 'add caption control to video player', -> - expect($('.video')).toContain 'a.hide-subtitles' + it 'create the caption element', -> + expect($('.video')).toContain 'ol.subtitles' - it 'fetch the caption', -> - expect($.getWithPrefix).toHaveBeenCalledWith @caption.captionURL(), jasmine.any(Function) + it 'add caption control to video player', -> + expect($('.video')).toContain 'a.hide-subtitles' - it 'render the caption', -> - expect($('.subtitles').html()).toMatch new RegExp(''' -
  • Caption at 0
  • -
  • Caption at 10000
  • -
  • Caption at 20000
  • -
  • Caption at 30000
  • -
  • Caption at 40000
  • -
  • Caption at 50000
  • -
  • Caption at 60000
  • -
  • Caption at 70000
  • -
  • Caption at 80000
  • -
  • Caption at 90000
  • -
  • Caption at 100000
  • -
  • Caption at 110000
  • -
  • Caption at 120000
  • - '''.replace(/\n/g, '')) + it 'fetch the caption', -> + expect($.getWithPrefix).toHaveBeenCalledWith @caption.captionURL(), jasmine.any(Function) - it 'add a padding element to caption', -> - expect($('.subtitles li:first')).toBe '.spacing' - expect($('.subtitles li:last')).toBe '.spacing' + it 'bind window resize event', -> + expect($(window)).toHandleWith 'resize', @caption.onWindowResize - it 'bind all the caption link', -> - $('.subtitles li[data-index]').each (index, link) => - expect($(link)).toHandleWith 'click', @caption.seekPlayer + it 'bind player resize event', -> + expect($(@player)).toHandleWith 'resize', @caption.onWindowResize - it 'bind window resize event', -> - expect($(window)).toHandleWith 'resize', @caption.onWindowResize + it 'bind player updatePlayTime event', -> + expect($(@player)).toHandleWith 'updatePlayTime', @caption.onUpdatePlayTime - it 'bind player resize event', -> - expect($(@player)).toHandleWith 'resize', @caption.onWindowResize + it 'bind player play event', -> + expect($(@player)).toHandleWith 'play', @caption.onPlay - it 'bind player updatePlayTime event', -> - expect($(@player)).toHandleWith 'updatePlayTime', @caption.onUpdatePlayTime + it 'bind the hide caption button', -> + expect($('.hide-subtitles')).toHandleWith 'click', @caption.toggle - it 'bind the hide caption button', -> - expect($('.hide-subtitles')).toHandleWith 'click', @caption.toggle + it 'bind the mouse movement', -> + expect($('.subtitles')).toHandleWith 'mouseenter', @caption.onMouseEnter + expect($('.subtitles')).toHandleWith 'mouseleave', @caption.onMouseLeave + expect($('.subtitles')).toHandleWith 'mousemove', @caption.onMovement + expect($('.subtitles')).toHandleWith 'mousewheel', @caption.onMovement + expect($('.subtitles')).toHandleWith 'DOMMouseScroll', @caption.onMovement - it 'bind the mouse movement', -> - expect($('.subtitles')).toHandleWith 'mouseenter', @caption.onMouseEnter - expect($('.subtitles')).toHandleWith 'mouseleave', @caption.onMouseLeave - expect($('.subtitles')).toHandleWith 'mousemove', @caption.onMovement - expect($('.subtitles')).toHandleWith 'mousewheel', @caption.onMovement - expect($('.subtitles')).toHandleWith 'DOMMouseScroll', @caption.onMovement + describe 'when on a non touch-based device', -> + beforeEach -> + spyOn(window, 'onTouchBasedDevice').andReturn false + @caption = new VideoCaption @player, 'def456' + + it 'render the caption', -> + expect($('.subtitles').html()).toMatch new RegExp(''' +
  • Caption at 0
  • +
  • Caption at 10000
  • +
  • Caption at 20000
  • +
  • Caption at 30000
  • + '''.replace(/\n/g, '')) + + it 'add a padding element to caption', -> + expect($('.subtitles li:first')).toBe '.spacing' + expect($('.subtitles li:last')).toBe '.spacing' + + it 'bind all the caption link', -> + $('.subtitles li[data-index]').each (index, link) => + expect($(link)).toHandleWith 'click', @caption.seekPlayer + + it 'set rendered to true', -> + expect(@caption.rendered).toBeTruthy() + + describe 'when on a touch-based device', -> + beforeEach -> + spyOn(window, 'onTouchBasedDevice').andReturn true + @caption = new VideoCaption @player, 'def456' + + it 'show explaination message', -> + expect($('.subtitles li')).toHaveHtml "Caption will be displayed when you start playing the video." + + it 'does not set rendered to true', -> + expect(@caption.rendered).toBeFalsy() describe 'mouse movement', -> beforeEach -> @@ -145,8 +161,34 @@ describe 'VideoCaption', -> expect(@caption.search(9999)).toEqual 0 expect(@caption.search(10000)).toEqual 1 expect(@caption.search(15000)).toEqual 1 - expect(@caption.search(120000)).toEqual 12 - expect(@caption.search(120001)).toEqual 12 + expect(@caption.search(30000)).toEqual 3 + expect(@caption.search(30001)).toEqual 3 + + describe 'onPlay', -> + describe 'when the caption was not rendered', -> + beforeEach -> + spyOn(window, 'onTouchBasedDevice').andReturn true + @caption = new VideoCaption @player, 'def456' + @caption.onPlay() + + it 'render the caption', -> + expect($('.subtitles').html()).toMatch new RegExp(''' +
  • Caption at 0
  • +
  • Caption at 10000
  • +
  • Caption at 20000
  • +
  • Caption at 30000
  • + '''.replace(/\n/g, '')) + + it 'add a padding element to caption', -> + expect($('.subtitles li:first')).toBe '.spacing' + expect($('.subtitles li:last')).toBe '.spacing' + + it 'bind all the caption link', -> + $('.subtitles li[data-index]').each (index, link) => + expect($(link)).toHandleWith 'click', @caption.seekPlayer + + it 'set rendered to true', -> + expect(@caption.rendered).toBeTruthy() describe 'onUpdatePlayTime', -> beforeEach -> diff --git a/static/coffee/src/modules/video/video_caption.coffee b/static/coffee/src/modules/video/video_caption.coffee index 31a3d09e09..7d796245bb 100644 --- a/static/coffee/src/modules/video/video_caption.coffee +++ b/static/coffee/src/modules/video/video_caption.coffee @@ -10,6 +10,7 @@ class @VideoCaption $(window).bind('resize', @onWindowResize) $(@player).bind('resize', @onWindowResize) $(@player).bind('updatePlayTime', @onUpdatePlayTime) + $(@player).bind('play', @onPlay) @$('.hide-subtitles').click @toggle @$('.subtitles').mouseenter(@onMouseEnter).mouseleave(@onMouseLeave) .mousemove(@onMovement).bind('mousewheel', @onMovement) @@ -32,7 +33,11 @@ class @VideoCaption $.getWithPrefix @captionURL(), (captions) => @captions = captions.text @start = captions.start - @renderCaption() + + if onTouchBasedDevice() + $('.subtitles li').html "Caption will be displayed when you start playing the video." + else + @renderCaption() renderCaption: -> container = $('
      ') @@ -49,6 +54,8 @@ class @VideoCaption @$('.subtitles').prepend($('
    1. ').height(@topSpacingHeight())) .append($('
    2. ').height(@bottomSpacingHeight())) + @rendered = true + search: (time) -> min = 0 max = @start.length - 1 @@ -62,6 +69,9 @@ class @VideoCaption return min + onPlay: => + @renderCaption() unless @rendered + onUpdatePlayTime: (event, time) => # This 250ms offset is required to match the video speed time = Math.round(Time.convert(time, @player.currentSpeed(), '1.0') * 1000 + 250)