From 607a2a133ffa44ac22c01a34d222446f42ca2e63 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Tue, 26 Aug 2014 16:46:23 -0700
Subject: [PATCH] Made the SuperModel a little bit more clever about handling
duplicate loaded models, hopefully fixed #1108.
---
app/models/SuperModel.coffee | 1 +
app/models/ThangType.coffee | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/models/SuperModel.coffee b/app/models/SuperModel.coffee
index 809f66383..25f781034 100644
--- a/app/models/SuperModel.coffee
+++ b/app/models/SuperModel.coffee
@@ -121,6 +121,7 @@ module.exports = class SuperModel extends Backbone.Model
if cachedModel
clone = $.extend true, {}, model.attributes
cachedModel.set(clone, {silent: true})
+ console.debug "Updated cached model <#{cachedModel.get('name') or cachedModel.getURL()}> with new data"
else
@registerModel(model)
collection
diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee
index 8a8d990ea..4fe5fb30a 100644
--- a/app/models/ThangType.coffee
+++ b/app/models/ThangType.coffee
@@ -13,8 +13,6 @@ module.exports = class ThangType extends CocoModel
initialize: ->
super()
@building = {}
- @setDefaults()
- @on 'sync', @setDefaults
@spriteSheets = {}
## Testing memory clearing
@@ -24,9 +22,6 @@ module.exports = class ThangType extends CocoModel
# @_previousAttributes.raw = null
#setTimeout f, 40000
- setDefaults: ->
- @resetRawData() unless @get('raw')
-
resetRawData: ->
@set('raw', {shapes: {}, containers: {}, animations: {}})