1 files changed, 251 insertions, 62 deletions

diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js
index 210d8cb7..ee2cc1be 100755
--- a/node_modules/montage/ui/template.js
+++ b/node_modules/montage/ui/template.js
@@ -37,7 +37,16 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 /**
     @private
 */
-    _document: {value: null},
+    _document: {
+        enumerable: false,
+        value: null
+    },
+
+    document: {
+        get: function() {
+            return this._document;
+        }
+    },
 /**
     @private
 */
@@ -134,6 +143,17 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         }
     },
 
+    initWithHtmlString: {
+        value: function(htmlString) {
+            var doc = this.createHtmlDocumentFromString(htmlString);
+
+            this._isLoaded = true;
+            this.initWithDocument(doc);
+
+            return this;
+        }
+    },
+
     /**
     Initializes the Template object with a specific module id that represents an HTML page.
     @function
@@ -234,63 +254,62 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         }
     },
 
-    /**
-     Instantiates the Template by specifying an object as the owner and a document where the elements referenced in the serialization should be found.
-     @function
-     @param {Object} rootObject The owner object of the template.
-     @param {HTMLDocument} document The HTML document to be used to find elements referenced from the serialization.
-     @param {Function} callback The callback function to invoke when the template is instantiated.
-    */
-    instantiateWithOwnerAndDocument: {
-        value: function(owner, document, callback) {
+    _deserialize: {
+        value: function(instances, targetDocument, callback) {
             var self = this,
                 defaultApplication = applicationExports.application;
-            this.getDeserializer(function(deserializer) {
-                function invokeTemplateDidLoad(objects) {
-                    owner = objects.owner;
-                    self._invokeTemplateDidLoadWithOwner(deserializer, owner);
-                    self.waitForStyles(function() {
-                        callback(owner);
-                    });
-                }
 
-                var externalObjects,
-                    targetDocument,
-                    instances;
+            this.getDeserializer(function(deserializer) {
+                var externalObjects;
 
                 if (deserializer) {
                     externalObjects = self._externalObjects;
                     if (externalObjects) {
-                        instances = Object.create(externalObjects);
-                        instances.owner = owner;
-                        instances.application = defaultApplication;
-                    } else {
-                        instances = {owner: owner, application: defaultApplication};
+                        for (var label in externalObjects) {
+                            if (!(label in instances)) {
+                                instances[label] = externalObjects[label];
+                            }
+                        }
                     }
 
-                    if (owner && owner._element) {
-                        targetDocument = owner._element.ownerDocument;
-                    }
+                    instances.application = defaultApplication;
+                    instances.template = self;
 
                     if (self._document === window.document) {
-                        deserializer.deserializeWithInstancesAndDocument(instances, self._document, invokeTemplateDidLoad);
+                        deserializer.deserializeWithInstancesAndDocument(instances, self._document, callback);
                     } else {
-                        self.setupDocument(window.document);
-                        deserializer.deserializeWithInstancesAndElementForDocument(instances, self._document.body, targetDocument, invokeTemplateDidLoad);
+                        deserializer.deserializeWithInstancesAndElementForDocument(instances, self._document.body, targetDocument, callback);
                     }
                 } else {
-                    if (self._document !== window.document) {
-                        self.setupDocument(window.document);
-                    }
-                    self.waitForStyles(function() {
-                        callback();
-                    });
+                    callback();
                 }
             });
         }
     },
 
     /**
+     Instantiates the Template by specifying an object as the owner and a document where the elements referenced in the serialization should be found.
+     @function
+     @param {Object} rootObject The owner object of the template.
+     @param {HTMLDocument} document The HTML document to be used to find elements referenced from the serialization.
+     @param {Function} callback The callback function to invoke when the template is instantiated.
+    */
+    instantiateWithOwnerAndDocument: {
+        value: function(owner, targetDocument, callback) {
+            var self = this;
+
+            this._partiallyInstantiateWithInstancesForDocument({owner: owner}, targetDocument, function(objects) {
+                if (objects) {
+                    self._invokeTemplateDidLoad(objects);
+                }
+                self.waitForStyles(function() {
+                    callback(objects ? objects.owner : null);
+                });
+            });
+        }
+    },
+
+    /**
      Instantiates the Template by using a component as the owner.
      All elements refereced in the serialization will be found on the document the component is attached to.
      @function
@@ -303,32 +322,86 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         this.instantiateWithOwnerAndDocument(component, document, callback);
     }},
 
+    instantiateWithDocument: {
+        value: function(document, callback) {
+            return this.instantiateWithOwnerAndDocument(null, document, callback);
+        }
+    },
+
+    _partiallyInstantiateWithInstancesForDocument: {
+        value: function(instances, targetDocument, callback) {
+            var self = this,
+                owner = instances.owner;
+
+            if (!targetDocument && owner && owner._element) {
+                targetDocument = owner._element.ownerDocument;
+            }
+
+            function importHeaders(objects) {
+                if (self._document !== targetDocument) {
+                    self.exportHeaders(targetDocument);
+                }
+                callback(objects);
+            }
+
+            this._deserialize(instances, targetDocument, function(objects, element) {
+                if (self._extends && !self._isExpanded) {
+                    var _extends = self._extends,
+                        element = _extends.element,
+                        instances = _extends.instances,
+                        instancesMapping = _extends.instancesMapping,
+                        elementId = _extends.elementId;
+
+                    if (!element && elementId) {
+                        element = element.querySelector("*[data-montage-id='" + elementId + "']");
+                    }
+
+                    if (!instances) {
+                        if (instancesMapping) {
+                            instances = {};
+                            for (var label in instancesMapping) {
+                                instances[label] = objects[instancesMapping[label]];
+                            }
+                            instances.owner = objects.owner;
+                        } else {
+                            instances = {owner: objects.owner};
+                        }
+                    }
+                    self._extendsTemplateWithInstances(_extends.templateModuleId, element, instances, function(extendsObjects) {
+                        var labels = Object.keys(extendsObjects);
+
+                        for (var i =0, label; (label = labels[i]); i++) {
+                            objects[label] = extendsObjects[label];
+                        }
+                        importHeaders(objects);
+                    });
+                } else {
+                    importHeaders(objects);
+                }
+            });
+        }
+    },
+
     /**
      Instantiates the Template with no elements references.
      @function
      */
-    instantiate: {value: function() {
-        var self = this;
-        var deserializer = Deserializer.create();
-
-        function invokeTemplateDidLoad(owner) {
+    instantiate: {
+        value: function(callback) {
+            return this.instantiateWithOwnerAndDocument(null, null, callback);