[FIX] only try to load CSS, QWeb and JS files if there are new modules to reload, especially as the new conditional requests will blow up when trying to load nothing at all
bzr revid: xmo@openerp.com-20120210145502-gbtq09g75xxt83c4
This commit is contained in:
parent
9b7539ae26
commit
d237ba0a2b
|
@ -732,17 +732,21 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
|
||||||
var params = { mods: all_modules, lang: lang};
|
var params = { mods: all_modules, lang: lang};
|
||||||
var to_load = _.difference(result, self.module_list).join(',');
|
var to_load = _.difference(result, self.module_list).join(',');
|
||||||
self.module_list = all_modules;
|
self.module_list = all_modules;
|
||||||
return $.when(
|
|
||||||
self.rpc('/web/webclient/csslist', {mods: to_load}, self.do_load_css),
|
var loaded = $.Deferred().resolve().promise();
|
||||||
self.rpc('/web/webclient/qweblist', {mods: to_load}).pipe(self.do_load_qweb),
|
if (to_load.length) {
|
||||||
self.rpc('/web/webclient/translations', params).pipe(function(trans) {
|
loaded = $.when(
|
||||||
openerp.web._t.database.set_bundle(trans);
|
self.rpc('/web/webclient/csslist', {mods: to_load}, self.do_load_css),
|
||||||
var file_list = ["/web/static/lib/datejs/globalization/" + lang.replace("_", "-") + ".js"];
|
self.rpc('/web/webclient/qweblist', {mods: to_load}).pipe(self.do_load_qweb),
|
||||||
return self.rpc('/web/webclient/jslist', {mods: to_load}).pipe(function(files) {
|
self.rpc('/web/webclient/translations', params).pipe(function(trans) {
|
||||||
return self.do_load_js(file_list.concat(files));
|
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: to_load}).pipe(function(files) {
|
||||||
).then(function() {
|
return self.do_load_js(file_list.concat(files));
|
||||||
|
});
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
return loaded.then(function() {
|
||||||
self.on_modules_loaded();
|
self.on_modules_loaded();
|
||||||
if (!no_session_valid_signal) {
|
if (!no_session_valid_signal) {
|
||||||
self.on_session_valid();
|
self.on_session_valid();
|
||||||
|
|
Loading…
Reference in New Issue