codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-27 17:45:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1256 from rubenvereecken/patch_fix

Browse source 
Patch fix: applyDelta now always called
This commit is contained in:
Scott Erickson 2014-07-04 11:45:22 -07:00
commit f553a1c493
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/editor/delta.coffee
View file

@ -112,4 +112,4 @@ module.exports = class DeltaView extends CocoView
delta = @model.getDelta()
delta = deltasLib.pruneConflictsFromDelta delta, @conflicts if @conflicts
delta = deltasLib.pruneExpandedDeltasFromDelta delta, @skippedDeltas if @skippedDeltas
delta
delta

7
app/views/editor/patch_modal.coffee
View file

@ -23,8 +23,8 @@ module.exports = class PatchModal extends ModalView
else
@originalSource = new @targetModel.constructor({_id:targetID})
@supermodel.loadModel @originalSource, 'source_document'
onLoaded: ->
applyDelta: ->
@headModel = null
if @targetModel.hasWriteAccess()
@headModel = @originalSource.clone(false)
@ -36,6 +36,9 @@ module.exports = class PatchModal extends ModalView
@pendingModel.markToRevert true
@deltaWorked = @pendingModel.applyDelta(@patch.get('delta'))
@pendingModel.loaded = true
render: ->
@applyDelta() if @supermodel.finished()
super()
getRenderData: ->