From 13ae16997d4bbca14e255d5989d1c44a76eac72c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 15:23:48 -0700 Subject: montage v.0.10 integration Signed-off-by: Valerio Virgillito --- node_modules/montage/core/deserializer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node_modules/montage/core/deserializer.js') diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js index c1c97b2b..2b3ed64e 100755 --- a/node_modules/montage/core/deserializer.js +++ b/node_modules/montage/core/deserializer.js @@ -142,7 +142,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri return this; }}, - initWithObjectAndRequire: {value: function(string, require, origin) { + initWithObjectAndRequire: {value: function(object, require, origin) { this._reset(); this._serializationString = JSON.stringify(object); this._require = require; @@ -1075,7 +1075,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri object; for (var label in objects) { - if (label in labels) { + if (labels[label] != null) { // we should call deserializedFromSerialization on all instantiated objects even if they were passed as null/undefined in instances. continue; } object = objects[label]; -- cgit v1.2.3