From 24b483db367291b72170f969de78efcb1a9b95bd Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 22:53:07 -0700 Subject: integrating the latest montage version Signed-off-by: Valerio Virgillito --- node_modules/montage/core/deserializer.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 b8ed5618..c1c97b2b 100755 --- a/node_modules/montage/core/deserializer.js +++ b/node_modules/montage/core/deserializer.js @@ -332,11 +332,6 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri @param {Array} properties The property names to be deserialized. */ deserializePropertiesForObject: {value: function(object, properties) { - // TODO: ensure backward compatibility - if (properties && "childComponents" in properties) { - properties.childComponents = []; - console.log('Warning: "childComponents" isn\'t supported on components within the current serializaation format, this property will be reset to [].'); - } for (var key in properties) { object[key] = properties[key]; } @@ -846,8 +841,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri if (id) { return 'element.getElementById("' + id + '")'; } else { - // TODO: getElemenyById only here for backwards compatibility - return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\') || element.getElementById("' + value + '")'; + return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\')'; } break; @@ -859,7 +853,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri break; case "reference": - var object; + var object, + originalValue = value; if (value in exports) { object = exports[value]; @@ -874,6 +869,9 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri if (parent) { parent[key] = object; } + if (typeof object === "undefined") { + logger.error("Missing object in serialization: '" + originalValue + "'" + (self._origin ? " in " + self._origin : "")); + } return value; break; -- cgit v1.2.3