From 4995ea62cc5dd025106ddb6e42a9db885657d9ce Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Dec 2011 16:52:29 +0100 Subject: [PATCH] [FIX] Ensure modules js is loaded after modules qwebs bzr revid: fme@openerp.com-20111219155229-rbbsr5slsl7161pk --- addons/web/static/src/js/core.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index e2c84aaa92f..3bbf94379cf 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -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(); }); });