diff options
Diffstat (limited to 'node_modules/montage/ui/template.js')
-rwxr-xr-x | node_modules/montage/ui/template.js | 13 |
1 files changed, 9 insertions, 4 deletions
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 | |||
50 | /** | 50 | /** |
51 | @private | 51 | @private |
52 | */ | 52 | */ |
53 | _require: {value: window.require}, | ||
53 | _externalObjects: {value: null}, | 54 | _externalObjects: {value: null}, |
54 | _ownerSerialization: {value: null}, | 55 | _ownerSerialization: {value: null}, |
55 | _rootUrl: {value: null}, | 56 | _rootUrl: {value: null}, |
@@ -63,7 +64,10 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
63 | @function | 64 | @function |
64 | @return {module:montage/template.Template} | 65 | @return {module:montage/template.Template} |
65 | */ | 66 | */ |
66 | initWithDocument: {value: function(doc) { | 67 | initWithDocument: {value: function(doc, requireFunction) { |
68 | if (requireFunction) { | ||
69 | this._require = requireFunction; | ||
70 | } | ||
67 | this._document = doc; | 71 | this._document = doc; |
68 | 72 | ||
69 | return this; | 73 | return this; |
@@ -165,6 +169,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
165 | initWithModuleId: {value: function(requireFunction, moduleId, callback) { | 169 | initWithModuleId: {value: function(requireFunction, moduleId, callback) { |
166 | var self = this; | 170 | var self = this; |
167 | 171 | ||
172 | this._require = requireFunction; | ||
168 | this.createHtmlDocumentFromModuleId(requireFunction, moduleId, function(doc) { | 173 | this.createHtmlDocumentFromModuleId(requireFunction, moduleId, function(doc) { |
169 | if (!doc) { | 174 | if (!doc) { |
170 | throw "Template '" + moduleId + "' not found."; | 175 | throw "Template '" + moduleId + "' not found."; |
@@ -191,7 +196,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
191 | */ | 196 | */ |
192 | serializer: { | 197 | serializer: { |
193 | get: function() { | 198 | get: function() { |
194 | return this._serializer || (this._serializer = Serializer.create().initWithRequire(window.require)); | 199 | return this._serializer || (this._serializer = Serializer.create().initWithRequire(this._require)); |
195 | } | 200 | } |
196 | }, | 201 | }, |
197 | 202 | ||
@@ -479,7 +484,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
479 | // reset this property in order to use it at the extended template | 484 | // reset this property in order to use it at the extended template |
480 | owner._templateElement = null; | 485 | owner._templateElement = null; |
481 | 486 | ||
482 | Template.templateWithModuleId(window.require, templateModuleId, function(template) { | 487 | Template.templateWithModuleId(this._require, templateModuleId, function(template) { |
483 | template._partiallyInstantiateWithInstancesForDocument({owner: owner}, ownerTemplateDocument, function(objects) { | 488 | template._partiallyInstantiateWithInstancesForDocument({owner: owner}, ownerTemplateDocument, function(objects) { |
484 | importNodes(owner._templateElement, element, ownerTemplateElement); | 489 | importNodes(owner._templateElement, element, ownerTemplateElement); |
485 | if (!self._isExpanded) { | 490 | if (!self._isExpanded) { |
@@ -915,7 +920,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont | |||
915 | */ | 920 | */ |
916 | _createDeserializer: {value: function(serialization) { | 921 | _createDeserializer: {value: function(serialization) { |
917 | var rootUrl = this._rootUrl ? this._rootUrl.input : window.location.href; | 922 | var rootUrl = this._rootUrl ? this._rootUrl.input : window.location.href; |
918 | return this._deserializer = Deserializer.create().initWithStringAndRequire(this._ownerSerialization = serialization, window.require, rootUrl); | 923 | return this._deserializer = Deserializer.create().initWithStringAndRequire(this._ownerSerialization = serialization, this._require, rootUrl); |
919 | }}, | 924 | }}, |
920 | 925 | ||
921 | /** | 926 | /** |