aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/application.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-20 15:20:04 -0700
committerAnanya Sen2012-06-20 15:20:04 -0700
commitcaa9683fd259307658f96190a5c5bd771126fbb8 (patch)
tree83983a8819487ce8b33f65f5d20e34af2df8dd26 /node_modules/montage/ui/application.js
parentd852ea28dad399e84e8d5e69c0293500c30b59f1 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'node_modules/montage/ui/application.js')
-rwxr-xr-xnode_modules/montage/ui/application.js33
1 files changed, 16 insertions, 17 deletions
diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js
index bbce6835..025ef950 100755
--- a/node_modules/montage/ui/application.js
+++ b/node_modules/montage/ui/application.js
@@ -137,28 +137,27 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
137 value: null 137 value: null
138 }, 138 },
139 139
140 /** 140 _load: {
141 Description TODO 141 value: function(applicationRequire, callback) {
142 @function 142 var template = Template.create().initWithDocument(window.document, applicationRequire),
143 @param {Function} callback A function to invoke after the method has completed. 143 rootComponent,
144 */
145 load: {
146 value: function(callback) {
147 var template = Template.create().initWithDocument(window.document),
148 component,
149 self = this; 144 self = this;
150 145
151 self = Application.isPrototypeOf(self) ? self : Application.create();
152
153 // assign to the exports so that it is available in the deserialization of the template 146 // assign to the exports so that it is available in the deserialization of the template
154 exports.application = self; 147 exports.application = self;
155 148
156 template.instantiateWithOwnerAndDocument(null, window.document, function() { 149 require.async("ui/component").then(function(exports) {
157 require("ui/component").__root__.needsDraw = true; 150 rootComponent = exports.__root__;
158 if (callback) { 151 rootComponent.element = document;
159 callback(self); 152 template.instantiateWithOwnerAndDocument(null, window.document, function() {
160 } 153 self.callDelegateMethod("willFinishLoading", self);
161 }); 154 rootComponent.needsDraw = true;
155 if (callback) {
156 callback(self);
157 }
158
159 });
160 }).end();
162 } 161 }
163 }, 162 },
164 163