- self.rpc('/web/webclient/translations',params).then(function(transs) {
- openerp.web._t.database.set_bundle(transs);
- var modules = self.module_list.join(',');
- var file_list = ["/web/static/lib/datejs/globalization/" +
- self.user_context.lang.replace("_", "-") + ".js"
- ];
-
- /*
- self.rpc('/web/webclient/qweblist', {mods: modules}, self.do_load_qweb);
- self.rpc('/web/webclient/csslist', {mods: modules}, self.do_load_css);
- self.rpc('/web/webclient/jslist', {mods: modules}, function(files) {
- self.do_load_js(file_list.concat(files));
- });
- openerp._modules_loaded = true;
- // */
-
- self.rpc('/web/webclient/qweblist', {mods: modules}, function(files) {
- self.do_load_qweb(files, function() {
- // once qweb files are loaded...
- self.rpc('/web/webclient/csslist', {mods: modules}, function(files) {
- self.do_load_css(files, function() {
- // once css files are loaded
- self.rpc('/web/webclient/jslist', {mods: modules}, function(files) {
- self.do_load_js(file_list.concat(files), function() {
- self.on_modules_loaded();
- self.module_loading.resolve();
- });
- });
- });
- });
+ var modules = self.module_list.join(',');
+ 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/translations', params).pipe(function(trans) {
+ openerp.web._t.database.set_bundle(trans);
+ var file_list = ["/web/static/lib/datejs/globalization/" + lang.replace("_", "-") + ".js"];
+ return self.rpc('/web/webclient/jslist', {mods: modules}).pipe(function(files) {
+ return self.do_load_js(file_list.concat(files));