diff options
Diffstat (limited to 'addons/web_editor/static/src/js/base.js')
| -rw-r--r-- | addons/web_editor/static/src/js/base.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/base.js index 4368f6de274..ac36b706f50 100644 --- a/addons/web_editor/static/src/js/base.js +++ b/addons/web_editor/static/src/js/base.js @@ -32,14 +32,11 @@ data.dom_ready = dom_ready; var all_ready; data.ready = function () { if (!all_ready) { - all_ready = $.when(dom_ready, ajax.loadXML()).then(function () { - // TODO find a better way to find if we are in the backend or not - // We don't load translation if we are in the backend since it's already done by the webclient - if (!$(document).find('.o_web_client').length) { - return load_translations(); - } - }); - } else if(all_ready.state() === "resolved") { // can add async template + all_ready = $.when(dom_ready, ajax.loadXML()); + if (!odoo._modules) { + all_ready.then(load_translations); + } + } else { // can add async template all_ready = $.when(dom_ready, ajax.loadXML()); } return all_ready; |
