Merge branch 'refs/heads/ninja-internal' into WebGLFixes

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
     _invokeTemplateDidLoadWithOwner: {
         value: function(deserializer, owner) {
             var objects = deserializer.getObjectsFromLastDeserialization(),
+                hasTemplateDidDeserializeObject = owner && typeof owner.templateDidDeserializeObject === "function",
                 i,
                 object;
 
@@ -335,6 +336,9 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
                     if (typeof object.deserializedFromTemplate === "function") {
                         object.deserializedFromTemplate(owner);
                     }
+                    if (hasTemplateDidDeserializeObject) {
+                        owner.templateDidDeserializeObject(object);
+                    }
                 }
             }