[MERGE] forward port branch 10.0 up to 8e38a3d069c

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/base.js
index ac36b706f50..f7ba58ac636 100644
--- a/addons/web_editor/static/src/js/base.js
+++ b/addons/web_editor/static/src/js/base.js
@@ -32,14 +32,13 @@ data.dom_ready = dom_ready;
 var all_ready;
 data.ready = function () {
     if (!all_ready) {
-        all_ready = $.when(dom_ready, ajax.loadXML());
+        all_ready = dom_ready;
         if (!odoo._modules) {
-            all_ready.then(load_translations);
+            all_ready = all_ready.then(load_translations);
         }
-    } else { // can add async template
-        all_ready = $.when(dom_ready, ajax.loadXML());
     }
-    return all_ready;
+    // also load new templates since previous ready call
+    return $.when(all_ready, ajax.loadXML());
 };
 
 function load_translations() {