From f7e4257745ccd44b8d24555f0ef787429d6e472c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 5 Jun 2012 00:11:03 -0700
Subject: adding the latest v0.10 montage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 node_modules/montage/ui/template.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'node_modules/montage/ui/template.js')

diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js
index 6dbf2c67..eb44a9b5 100755
--- a/node_modules/montage/ui/template.js
+++ b/node_modules/montage/ui/template.js
@@ -50,6 +50,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 /**
     @private
 */
+    _require: {value: window.require},
     _externalObjects: {value: null},
     _ownerSerialization: {value: null},
     _rootUrl: {value: null},
@@ -63,7 +64,10 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     @function
     @return {module:montage/template.Template}
     */
-    initWithDocument: {value: function(doc) {
+    initWithDocument: {value: function(doc, requireFunction) {
+        if (requireFunction) {
+            this._require = requireFunction;
+        }
         this._document = doc;
 
         return this;
@@ -165,6 +169,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     initWithModuleId: {value: function(requireFunction, moduleId, callback) {
         var self = this;
 
+        this._require = requireFunction;
         this.createHtmlDocumentFromModuleId(requireFunction, moduleId, function(doc) {
             if (!doc) {
                 throw "Template '" + moduleId + "' not found.";
@@ -191,7 +196,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     */
     serializer: {
         get: function() {
-            return this._serializer || (this._serializer = Serializer.create().initWithRequire(window.require));
+            return this._serializer || (this._serializer = Serializer.create().initWithRequire(this._require));
         }
     },
 
@@ -479,7 +484,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             // reset this property in order to use it at the extended template
             owner._templateElement = null;
 
-            Template.templateWithModuleId(window.require, templateModuleId, function(template) {
+            Template.templateWithModuleId(this._require, templateModuleId, function(template) {
                 template._partiallyInstantiateWithInstancesForDocument({owner: owner}, ownerTemplateDocument, function(objects) {
                     importNodes(owner._templateElement, element, ownerTemplateElement);
                     if (!self._isExpanded) {
@@ -915,7 +920,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     */
     _createDeserializer: {value: function(serialization) {
         var rootUrl = this._rootUrl ? this._rootUrl.input : window.location.href;
-        return this._deserializer = Deserializer.create().initWithStringAndRequire(this._ownerSerialization = serialization, window.require, rootUrl);
+        return this._deserializer = Deserializer.create().initWithStringAndRequire(this._ownerSerialization = serialization, this._require, rootUrl);
     }},
 
     /**
-- 
cgit v1.2.3