codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed merge junk

Browse source
This commit is contained in:
George Saines 2014-09-11 11:08:25 -07:00
parent b81288cf52
commit 040b901e41
1 changed files with 2 additions and 8 deletions

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

@ -339,11 +339,8 @@ module.exports = class LevelPlaybackView extends CocoView
@slideCount = 0 @slideCount = 0
@wasPlaying = @playing @wasPlaying = @playing
Backbone.Mediator.publish 'level:set-playing', {playing: false} Backbone.Mediator.publish 'level:set-playing', {playing: false}
<<<<<<< HEAD
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: .01
=======
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: 0.5 Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: 0.5
>>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
stop: (event, ui) => stop: (event, ui) =>
return if @shouldIgnore() return if @shouldIgnore()
@ -355,11 +352,8 @@ module.exports = class LevelPlaybackView extends CocoView
Backbone.Mediator.publish 'level:set-playing', {playing: false} Backbone.Mediator.publish 'level:set-playing', {playing: false}
@$el.find('.scrubber-handle').effect('bounce', {times: 2}) @$el.find('.scrubber-handle').effect('bounce', {times: 2})
else else
<<<<<<< HEAD
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: .01
=======
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: 0.5 Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: 0.5
>>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
) )
getScrubRatio: -> getScrubRatio: ->