aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/deserializer.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 15:23:48 -0700
committerValerio Virgillito2012-05-16 15:23:48 -0700
commit13ae16997d4bbca14e255d5989d1c44a76eac72c (patch)
treed9ebb1dcc6bebee4cb910b950ecb67c1a2d593cd /node_modules/montage/core/deserializer.js
parent99f16ae08fbb0a6dfe6008c9833f2253b18c19e5 (diff)
downloadninja-13ae16997d4bbca14e255d5989d1c44a76eac72c.tar.gz
montage v.0.10 integration
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/deserializer.js')
-rwxr-xr-xnode_modules/montage/core/deserializer.js4
1 files changed, 2 insertions, 2 deletions
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
142 return this; 142 return this;
143 }}, 143 }},
144 144
145 initWithObjectAndRequire: {value: function(string, require, origin) { 145 initWithObjectAndRequire: {value: function(object, require, origin) {
146 this._reset(); 146 this._reset();
147 this._serializationString = JSON.stringify(object); 147 this._serializationString = JSON.stringify(object);
148 this._require = require; 148 this._require = require;
@@ -1075,7 +1075,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
1075 object; 1075 object;
1076 1076
1077 for (var label in objects) { 1077 for (var label in objects) {
1078 if (label in labels) { 1078 if (labels[label] != null) { // we should call deserializedFromSerialization on all instantiated objects even if they were passed as null/undefined in instances.
1079 continue; 1079 continue;
1080 } 1080 }
1081 object = objects[label]; 1081 object = objects[label];