diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /node_modules/montage | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage')
110 files changed, 3370 insertions, 3582 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 | |