From 7cb865fab87290b1c3e162265ee4a372c84a38f9 Mon Sep 17 00:00:00 2001 From: fwi-odoo Date: Tue, 13 Dec 2016 11:40:53 +0100 Subject: [PATCH] [IMP] web_editor: avoid loading translation in the backend twice --- addons/web_editor/static/src/js/base.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/base.js index f65ecaa7c02..e4e2fcd6cad 100644 --- a/addons/web_editor/static/src/js/base.js +++ b/addons/web_editor/static/src/js/base.js @@ -32,14 +32,20 @@ data.dom_ready = dom_ready; var all_ready; data.ready = function () { if (!all_ready) { - all_ready = $.when(dom_ready, ajax.loadXML()).then(translations); + 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) { + load_translations(); + } + }); } else if(all_ready.state() === "resolved") { // can add async template all_ready = $.when(dom_ready, ajax.loadXML()); } return all_ready; }; -function translations() { +function load_translations() { function translate_node(node) { if(node.nodeType === 3) { // TEXT_NODE if(node.nodeValue.match(/\S/)) {