diff options
author | Nivesh Rajbhandari | 2012-03-09 13:49:24 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-09 13:49:24 -0800 |
commit | a782acfbbf2d1ac5630c2cae5affcc369ba99785 (patch) | |
tree | c3a17caf06fce37a0c3a9054cd52b0f2f8ea844c /node_modules/montage/ui/template.js | |
parent | e2562c3f24eb5dbfb9e3bd2868cdf1a2806644bf (diff) | |
parent | b4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff) | |
download | ninja-a782acfbbf2d1ac5630c2cae5affcc369ba99785.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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 | ||