codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-14 05:55:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-02-11 12:02:53 -08:00
commit d22c716dce
3 changed files with 6 additions and 0 deletions

1
app/lib/God.coffee
View file

@ -208,6 +208,7 @@ class Angel
@
abort: ->
return unless @worker
@abortTimeout = _.delay @terminate, @abortTimeoutDuration
@worker.postMessage {func: 'abort'}

1
app/views/play/level/playback_view.coffee
View file

@ -239,4 +239,5 @@ module.exports = class PlaybackView extends View
destroy: ->
super()
me.off('change:music', @updateMusicButton, @)
$(window).off('resize', @onWindowResize)

4
app/views/play/level/tome/spell_palette_entry_view.coffee
View file

@ -54,3 +54,7 @@ module.exports = class SpellPaletteEntryView extends View
@options.thang = @thang = e.selectedThang # Update our thang to the current version
@options.doc = @doc = Docs.getDocsFor(@thang, [@doc.prop])[0]
@$el.find("code.current-value").text(@doc.formatValue()) # Don't call any functions. (?? What does this mean?)
destroy: ->
@$el.off()
super()