summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/public
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-08-14 16:48:10 +0200
committerChristophe Simonis <chs@odoo.com>2019-08-14 16:48:10 +0200
commit140ee6b8f0b0de7ddcc816496269963612c5d0c6 (patch)
tree7bdaa065d215b88fea4fa56adbfa79cdc24deb69 /addons/web/static/src/js/public
parent839696d2d7dd574fd8958d17726379926e94d590 (diff)
parent98a55917a602c0c47093b4270ebc4e8b416ecf32 (diff)
[MERGE] forward port branch saas-12.4 up to 98a55917a60
Diffstat (limited to 'addons/web/static/src/js/public')
-rw-r--r--addons/web/static/src/js/public/public_root_instance.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/addons/web/static/src/js/public/public_root_instance.js b/addons/web/static/src/js/public/public_root_instance.js
index 8202e011cc3..988d939bbe1 100644
--- a/addons/web/static/src/js/public/public_root_instance.js
+++ b/addons/web/static/src/js/public/public_root_instance.js
@@ -1,7 +1,7 @@
odoo.define('root.widget', function (require) {
'use strict';
-require('web.dom_ready');
+var lazyloader = require('web.public.lazyloader');
var rootData = require('web.public.root');
/**
@@ -11,7 +11,10 @@ var rootData = require('web.public.root');
* been consumed.
*/
var publicRoot = new rootData.PublicRoot(null);
-return publicRoot.attachTo(document.body).then(function () {
- return publicRoot;
+return lazyloader.allScriptsLoaded.then(function () {
+ return publicRoot.attachTo(document.body).then(function () {
+ return publicRoot;
+ });
});
+
});