Normalized event naming

openid
Marcin Kulik 12 years ago
parent d581d4ede1
commit e001676f21

@ -29,14 +29,14 @@ class AsciiIo.Movie
if typeof window.Worker == 'function'
@unpackViaWorker()
else
@trigger('movie-loaded', @model)
@trigger 'loaded', @model
unpackViaWorker: ->
worker = new Worker(window.worker_unpack_path)
worker.onmessage = (event) =>
@_data = event.data
@trigger('movie-loaded', @model)
@trigger 'loaded', @model
data = @model.get('escaped_stdout_data')
data = atob(data)
@ -97,7 +97,7 @@ class AsciiIo.Movie
return if @isPaused()
@stop()
@trigger('playback-paused')
@trigger 'paused'
resume: ->
return if @isPlaying()
@ -109,7 +109,7 @@ class AsciiIo.Movie
delayMs = delay * 1000
delayLeft = delayMs - @totalFrameWaitTime
@processFrameWithDelay(delayLeft)
@trigger('playback-resumed')
@trigger 'resumed'
togglePlay: ->
if @isPlaying() then @pause() else @play()

@ -36,7 +36,7 @@ class AsciiIo.PlayerView extends Backbone.View
cols: @options.cols
lines: @options.lines
)
@movie.on 'movie-loaded', @onMovieLoaded, this
@movie.on 'loaded', @onMovieLoaded, this
@movie.load()
onStartPromptClick: ->
@ -58,8 +58,8 @@ class AsciiIo.PlayerView extends Backbone.View
@movie.on 'reset', => @vt.reset()
@movie.on 'finished', => @vt.stopCursorBlink()
@movie.on 'wakeup', => @vt.restartCursorBlink()
@movie.on 'playback-paused', => @hudView.onPause()
@movie.on 'playback-resumed', => @hudView.onResume()
@movie.on 'paused', => @hudView.onPause()
@movie.on 'resumed', => @hudView.onResume()
@movie.on 'time', (time) => @hudView.updateTime(time)
@movie.on 'started', => @$el.removeClass('not-started')

Loading…
Cancel
Save