diff options
author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/template.js | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/template.js')
-rwxr-xr-x | node_modules/montage/ui/template.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js index 509e3406..c6589b35 100755 --- a/node_modules/montage/ui/template.js +++ b/node_modules/montage/ui/template.js | |||
@@ -324,6 +324,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
324 | _invokeTemplateDidLoadWithOwner: { | 324 | _invokeTemplateDidLoadWithOwner: { |
325 | value: function(deserializer, owner) { | 325 | value: function(deserializer, owner) { |
326 | var objects = deserializer.getObjectsFromLastDeserialization(), | 326 | var objects = deserializer.getObjectsFromLastDeserialization(), |
327 | hasTemplateDidDeserializeObject = owner && typeof owner.templateDidDeserializeObject === "function", | ||
327 | i, | 328 | i, |
328 | object; | 329 | object; |
329 | 330 | ||
@@ -335,6 +336,9 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
335 | if (typeof object.deserializedFromTemplate === "function") { | 336 | if (typeof object.deserializedFromTemplate === "function") { |
336 | object.deserializedFromTemplate(owner); | 337 | object.deserializedFromTemplate(owner); |
337 | } | 338 | } |
339 | if (hasTemplateDidDeserializeObject) { | ||
340 | owner.templateDidDeserializeObject(object); | ||
341 | } | ||
338 | } | 342 | } |
339 | } | 343 | } |
340 | 344 | ||