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

Fix for null/undefined objects in the diffs.

Browse source
This commit is contained in:
Nick Winter 2014-09-01 14:27:47 -07:00
parent 6df5ca00b2
commit 195e027b53
2 changed files with 2 additions and 4 deletions

4
app/lib/deltas.coffee
View file

@ -89,7 +89,7 @@ expandFlattenedDelta = (delta, left, schema) ->
delta
module.exports.makeJSONDiffer = ->
hasher = (obj) -> obj.name || obj.id || obj._id || JSON.stringify(_.keys(obj))
hasher = (obj) -> if obj? then obj.name or obj.id or obj._id or JSON.stringify(_.keys(obj)) else 'null'
jsondiffpatch.create({objectHash: hasher})
module.exports.getConflicts = (headDeltas, pendingDeltas) ->
@ -175,5 +175,3 @@ prunePath = (delta, path) ->
prunePath delta[path[0]], path.slice(1) unless delta[path[0]] is undefined
keys = (k for k in _.keys(delta[path[0]]) when k isnt '_t')
delete delta[path[0]] if keys.length is 0

2
app/views/modal/SaveVersionModal.coffee
View file

@ -37,7 +37,7 @@ module.exports = class SaveVersionModal extends ModalView
deltaView = new DeltaView({model: @model})
@insertSubView(deltaView, changeEl)
catch e
console.error 'Couldn\'t create delta view:', e
console.error 'Couldn\'t create delta view:', e, e.stack
@$el.find('.commit-message input').attr('placeholder', $.i18n.t('general.commit_msg'))
onSubmitForm: (e) ->