odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Ensure modules js is loaded after modules qwebs 

bzr revid: fme@openerp.com-20111219155229-rbbsr5slsl7161pk
This commit is contained in:
Fabien Meghazi 2011-12-19 16:52:29 +01:00
parent 5a2d37d47c
commit 4995ea62cc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web/static/src/js/core.js
View File

@ -643,11 +643,12 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
];
return $.when(
self.rpc('/web/webclient/csslist', {mods: modules}, self.do_load_css),
self.rpc('/web/webclient/qweblist', {mods: modules}).pipe(self.do_load_qweb),
self.rpc('/web/webclient/jslist', {mods: modules}).pipe(function(files) {
self.rpc('/web/webclient/qweblist', {mods: modules}).pipe(self.do_load_qweb)
).pipe(function() {
return self.rpc('/web/webclient/jslist', {mods: modules}).pipe(function(files) {
return self.do_load_js(file_list.concat(files));
})
).then(function() {
});
}).then(function() {
self.ready.resolve();
});
});