diff options
author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /node_modules | |
parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'node_modules')
95 files changed, 3380 insertions, 1850 deletions
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 | |||
332 | @param {Array} properties The property names to be deserialized. | 332 | @param {Array} properties The property names to be deserialized. |
333 | */ | 333 | */ |
334 | deserializePropertiesForObject: {value: function(object, properties) { | 334 | deserializePropertiesForObject: {value: function(object, properties) { |
335 | // TODO: ensure backward compatibility | ||
336 | if (properties && "childComponents" in properties) { | ||
337 | properties.childComponents = []; | ||
338 | console.log('Warning: "childComponents" isn\'t supported on components within the current serializaation format, this property will be reset to [].'); | ||
339 | } | ||
340 | for (var key in properties) { | 335 | for (var key in properties) { |
341 | object[key] = properties[key]; | 336 | object[key] = properties[key]; |
342 | } | 337 | } |
@@ -846,8 +841,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri | |||
846 | if (id) { | 841 | if (id) { |
847 | return 'element.getElementById("' + id + '")'; | 842 | return 'element.getElementById("' + id + '")'; |
848 | } else { | 843 | } else { |
849 | // TODO: getElemenyById only here for backwards compatibility | 844 | return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\')'; |
850 | return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\') || element.getElementById("' + value + '")'; | ||
851 | } | 845 | } |
852 | break; | 846 | break; |
853 | 847 | ||
@@ -859,7 +853,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri | |||
859 | break; | 853 | break; |
860 | 854 | ||
861 | case "reference": | 855 | case "reference": |
862 | var object; | 856 | var object, |
857 | originalValue = value; | ||
863 | 858 | ||
864 | if (value in exports) { | 859 | if (value in exports) { |
865 | object = exports[value]; | 860 | object = exports[value]; |
@@ -874,6 +869,9 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri | |||
874 | if (parent) { | 869 | if (parent) { |
875 | parent[key] = object; | 870 | parent[key] = object; |
876 | } | 871 | } |
872 | if (typeof object === "undefined") { | ||
873 | logger.error("Missing object in serialization: '" + originalValue + "'" + (self._origin ? " in " + self._origin : "")); | ||
874 | } | ||
877 | return value; | 875 | return value; |
878 | break; | 876 | break; |
879 | 877 | ||