diff options
author | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
commit | 54b15b3c39835ea999d9ddd8038a5531630e266d (patch) | |
tree | c207d1290be0e894a57b03098bbb7bbe5f2aee86 /node_modules/montage/ui/application.js | |
parent | ba125a7213cc257d648b22afb14f76d43f60d00d (diff) | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
download | ninja-54b15b3c39835ea999d9ddd8038a5531630e266d.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'node_modules/montage/ui/application.js')
-rwxr-xr-x | node_modules/montage/ui/application.js | 33 |
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 | ||