diff --git a/app/assets/javascripts/player/views/player_view.js.coffee b/app/assets/javascripts/player/views/player_view.js.coffee index 80440d6..6506718 100644 --- a/app/assets/javascripts/player/views/player_view.js.coffee +++ b/app/assets/javascripts/player/views/player_view.js.coffee @@ -65,7 +65,10 @@ class AsciiIo.PlayerView extends Backbone.View bindEvents: -> @movie.on 'started', => @$el.addClass 'playing' - @movie.on 'finished', => @$el.removeClass 'playing' + + @movie.on 'finished', => + @$el.removeClass 'playing' + @rendererView.stopCursorBlink() @movie.on 'paused', => @$el.addClass 'paused' @@ -77,13 +80,13 @@ class AsciiIo.PlayerView extends Backbone.View @$el.removeClass 'paused' @hudView.onResume() if @options.hud + @movie.on 'wakeup', => @rendererView.restartCursorBlink() + if @options.hud @movie.on 'time', (time) => @hudView.updateTime(time) @movie.on 'render', (state) => @rendererView.push state - @vt.on 'cursor:blink:restart', => @rendererView.restartCursorBlink() - @vt.on 'cursor:blink:stop', => @rendererView.stopCursorBlink() @vt.on 'cursor:show', => @rendererView.showCursor true @vt.on 'cursor:hide', => @rendererView.showCursor false diff --git a/app/assets/javascripts/player/vt/vt.js.coffee b/app/assets/javascripts/player/vt/vt.js.coffee index 5438ddc..10c9632 100644 --- a/app/assets/javascripts/player/vt/vt.js.coffee +++ b/app/assets/javascripts/player/vt/vt.js.coffee @@ -259,12 +259,6 @@ class AsciiIo.VT bell: -> @trigger 'bell' - restartCursorBlink: -> - @trigger 'cursor:blink:restart' - - stopCursorBlink: -> - @trigger 'cursor:blink:stop' - feed: (data) -> @data += data diff --git a/app/assets/javascripts/player/workers/main_worker.js.coffee b/app/assets/javascripts/player/workers/main_worker.js.coffee index a7705cc..a18571c 100644 --- a/app/assets/javascripts/player/workers/main_worker.js.coffee +++ b/app/assets/javascripts/player/workers/main_worker.js.coffee @@ -37,21 +37,11 @@ addEventListener 'message', (e) => postMessage evt: event, src: 'movie', args: args movie.on 'reset', => vt.reset() - movie.on 'finished', => vt.stopCursorBlink() - movie.on 'wakeup', => vt.restartCursorBlink() - - lastRenderTime = (new Date()).getTime() movie.on 'data', (data) => vt.feed data - - now = (new Date()).getTime() - - if true #or now - lastRenderTime > 40 - state = vt.state() - vt.clearChanges() - movie.trigger 'render', state - - lastRenderTime = now + state = vt.state() + vt.clearChanges() + movie.trigger 'render', state console.log 'inited!'