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

Fixed bug importing animations into existing ThangTypes that had only containers.

Browse source
This commit is contained in:
Nick Winter 2014-03-08 15:04:11 -08:00
parent 5bde534757
commit b3964571e1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/lib/sprites/SpriteParser.coffee
View file

@ -2,7 +2,10 @@ module.exports = class SpriteParser
constructor: (@thangTypeModel) -> constructor: (@thangTypeModel) ->
# Create a new ThangType, or work with one we've been building # Create a new ThangType, or work with one we've been building
@thangType = _.cloneDeep(@thangTypeModel.attributes.raw) @thangType = _.cloneDeep(@thangTypeModel.attributes.raw)
@thangType ?= {shapes: {}, containers: {}, animations: {}} @thangType ?= {}
@thangType.shapes ?= {}
@thangType.containers ?= {}
@thangType.animations ?= {}
# Internal parser state # Internal parser state
@shapeLongKeys = {} @shapeLongKeys = {}

2
app/views/editor/thang/edit.coffee
View file

@ -316,7 +316,7 @@ module.exports = class ThangTypeEditView extends View
@thangType.set 'actions', undefined @thangType.set 'actions', undefined
@clearDisplayObject() @clearDisplayObject()
@treema.set('/', @getThangData()) @treema.set('/', @getThangData())
getThangData: -> getThangData: ->
data = _.cloneDeep(@thangType.attributes) data = _.cloneDeep(@thangType.attributes)
data = _.pick data, (value, key) => not (key in ['components']) data = _.pick data, (value, key) => not (key in ['components'])