codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-24 19:59:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #811, a bug where you could pause the world if you clicked on a letterboxed playback scrubber.

Browse source
This commit is contained in:
Nick Winter 2014-08-23 14:55:58 -07:00
parent 8777a87774
commit 2e23247521
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/play/level/LevelPlaybackView.coffee
View file

@ -37,7 +37,7 @@ module.exports = class LevelPlaybackView extends CocoView
'click #zoom-out-button': -> Backbone.Mediator.publish('camera-zoom-out') unless @shouldIgnore() 'click #zoom-out-button': -> Backbone.Mediator.publish('camera-zoom-out') unless @shouldIgnore()
'click #volume-button': 'onToggleVolume' 'click #volume-button': 'onToggleVolume'
'click #play-button': 'onTogglePlay' 'click #play-button': 'onTogglePlay'
'click': -> Backbone.Mediator.publish 'tome:focus-editor' 'click': -> Backbone.Mediator.publish 'tome:focus-editor' unless @realTime
'mouseenter #timeProgress': 'onProgressEnter' 'mouseenter #timeProgress': 'onProgressEnter'
'mouseleave #timeProgress': 'onProgressLeave' 'mouseleave #timeProgress': 'onProgressLeave'
'mousemove #timeProgress': 'onProgressHover' 'mousemove #timeProgress': 'onProgressHover'
@ -316,15 +316,18 @@ module.exports = class LevelPlaybackView extends CocoView
max: @sliderIncrements max: @sliderIncrements
animate: 'slow' animate: 'slow'
slide: (event, ui) => slide: (event, ui) =>
return if @shouldIgnore()
@scrubTo ui.value / @sliderIncrements @scrubTo ui.value / @sliderIncrements
@slideCount += 1 @slideCount += 1
start: (event, ui) => start: (event, ui) =>
return if @shouldIgnore()
@slideCount = 0 @slideCount = 0
@wasPlaying = @playing @wasPlaying = @playing
Backbone.Mediator.publish 'level-set-playing', {playing: false} Backbone.Mediator.publish 'level-set-playing', {playing: false}
stop: (event, ui) => stop: (event, ui) =>
return if @shouldIgnore()
@actualProgress = ui.value / @sliderIncrements @actualProgress = ui.value / @sliderIncrements
Backbone.Mediator.publish 'playback:manually-scrubbed', ratio: @actualProgress Backbone.Mediator.publish 'playback:manually-scrubbed', ratio: @actualProgress
Backbone.Mediator.publish 'level-set-playing', {playing: @wasPlaying} Backbone.Mediator.publish 'level-set-playing', {playing: @wasPlaying}