diff --git a/addons/web/static/src/start.js b/addons/web/static/src/start.js
index 88f4de7d443..59201815592 100644
--- a/addons/web/static/src/start.js
+++ b/addons/web/static/src/start.js
@@ -6,7 +6,7 @@ import { mapLegacyEnvToWowlEnv } from "./legacy/utils";
import { localization } from "@web/core/l10n/localization";
import { session } from "@web/session";
import { renderToString } from "./core/utils/render";
-import { assets, templates } from "@web/core/assets";
+import { setLoadXmlDefaultApp, templates } from "@web/core/assets";
const { App, whenReady } = owl;
@@ -43,7 +43,7 @@ export async function startWebClient(Webclient) {
translateFn: env._t,
});
renderToString.app = app;
- assets.defaultApp = app;
+ setLoadXmlDefaultApp(app);
const root = await app.mount(document.body);
const classList = document.body.classList;
if (localization.direction === "rtl") {
diff --git a/addons/web/static/src/views/fields/journal_dashboard_graph/journal_dashboard_graph_field.js b/addons/web/static/src/views/fields/journal_dashboard_graph/journal_dashboard_graph_field.js
index 2bc13322efe..711fdaf743a 100644
--- a/addons/web/static/src/views/fields/journal_dashboard_graph/journal_dashboard_graph_field.js
+++ b/addons/web/static/src/views/fields/journal_dashboard_graph/journal_dashboard_graph_field.js
@@ -12,7 +12,7 @@ export class JournalDashboardGraphField extends Component {
this.canvasRef = useRef("canvas");
this.data = JSON.parse(this.props.value);
- onWillStart(() => loadJS(["/web/static/lib/Chart/Chart.js"]));
+ onWillStart(() => loadJS("/web/static/lib/Chart/Chart.js"));
useEffect(() => {
this.renderChart();
diff --git a/addons/web/static/src/views/graph/graph_renderer.js b/addons/web/static/src/views/graph/graph_renderer.js
index 01d596396d9..6b26d84b887 100644
--- a/addons/web/static/src/views/graph/graph_renderer.js
+++ b/addons/web/static/src/views/graph/graph_renderer.js
@@ -50,7 +50,7 @@ export class GraphRenderer extends Component {
this.tooltip = null;
this.legendTooltip = null;
- onWillStart(() => loadJS(["/web/static/lib/Chart/Chart.js"]));
+ onWillStart(() => loadJS("/web/static/lib/Chart/Chart.js"));
useEffect(() => this.renderChart());
onWillUnmount(this.onWillUnmount);
diff --git a/addons/web/static/tests/legacy/fields/basic_fields_tests.js b/addons/web/static/tests/legacy/fields/basic_fields_tests.js
index 3fd0d843acc..17b41385726 100644
--- a/addons/web/static/tests/legacy/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/legacy/fields/basic_fields_tests.js
@@ -1,7 +1,6 @@
odoo.define('web.basic_fields_tests', function (require) {
"use strict";
-var ajax = require('web.ajax');
var basicFields = require('web.basic_fields');
var concurrency = require('web.concurrency');
var config = require('web.config');
@@ -9071,12 +9070,6 @@ QUnit.module('Legacy basic_fields', {
form.destroy();
});
- QUnit.module('FieldColor', {
- before: function () {
- return ajax.loadXML('/web/static/src/legacy/xml/colorpicker.xml', core.qweb);
- },
- });
-
QUnit.test('Field Color: default widget state', async function (assert) {
assert.expect(4);
diff --git a/addons/web/static/tests/legacy/fields/signature_tests.js b/addons/web/static/tests/legacy/fields/signature_tests.js
index ad4375c475b..c2c1e23ec6c 100644
--- a/addons/web/static/tests/legacy/fields/signature_tests.js
+++ b/addons/web/static/tests/legacy/fields/signature_tests.js
@@ -1,8 +1,6 @@
odoo.define('web.signature_field_tests', function (require) {
"use strict";
-var ajax = require('web.ajax');
-var core = require('web.core');
var FormView = require('web.FormView');
var testUtils = require('web.test_utils');
@@ -38,13 +36,6 @@ QUnit.module('signature', {
};
}
}, function () {
-
- QUnit.module('Signature Field', {
- before: function () {
- return ajax.loadXML('/web/static/src/legacy/xml/name_and_signature.xml', core.qweb);
- },
- });
-
QUnit.test('Set simple field in "full_name" node option', async function (assert) {
assert.expect(3);
diff --git a/addons/web/static/tests/legacy/helpers/test_env.js b/addons/web/static/tests/legacy/helpers/test_env.js
index ac6bded5b7b..cededce739e 100644
--- a/addons/web/static/tests/legacy/helpers/test_env.js
+++ b/addons/web/static/tests/legacy/helpers/test_env.js
@@ -4,7 +4,7 @@ odoo.define('web.test_env', async function (require) {
const Bus = require('web.Bus');
const session = require('web.session');
const { makeTestEnvServices } = require('@web/../tests/legacy/helpers/test_services');
- const { templates } = require("@web/core/assets");
+ const { templates, setLoadXmlDefaultApp } = require("@web/core/assets");
const { renderToString } = require('@web/core/utils/render');
const { App, Component } = owl;
@@ -23,6 +23,7 @@ odoo.define('web.test_env', async function (require) {
if (!app) {
app = new App(null, { templates, test: true });
renderToString.app = app;
+ setLoadXmlDefaultApp(app);
}
const defaultTranslationParamters = {
diff --git a/addons/web/static/tests/legacy/helpers/test_utils.js b/addons/web/static/tests/legacy/helpers/test_utils.js
index cd021609026..7a3e9ac9161 100644
--- a/addons/web/static/tests/legacy/helpers/test_utils.js
+++ b/addons/web/static/tests/legacy/helpers/test_utils.js
@@ -10,8 +10,6 @@ odoo.define('web.test_utils', async function (require) {
* instance of a view, appended in the dom, ready to be tested.
*/
- const ajax = require('web.ajax');
- const core = require('web.core');
const relationalFields = require('web.relational_fields');
const session = require('web.session');
const testUtilsCreate = require('web.test_utils_create');
@@ -121,12 +119,9 @@ odoo.define('web.test_utils', async function (require) {
// before starting the qunit test suite.
// (session.js is in charge of loading the static xml bundle and we also have
// to load xml files that are normally lazy loaded by specific widgets).
- await Promise.all([
- session.is_bound,
- ajax.loadXML('/web/static/src/legacy/frontend/debug_manager/debug.xml', core.qweb),
- ajax.loadXML('/web/static/src/legacy/xml/dialog.xml', core.qweb),
- ajax.loadXML('/web/static/src/legacy/xml/translation_dialog.xml', core.qweb),
- ]);
+ // Assets can also contain static xml files. They are loaded when the session
+ // is launched.
+ await session.is_bound;
setTimeout(function () {
// jquery autocomplete refines the search in a setTimeout() parameterized
// with a delay, so we force this delay to 0 s.t. the dropdown is filtered
diff --git a/addons/web/static/tests/legacy/views/abstract_view_tests.js b/addons/web/static/tests/legacy/views/abstract_view_tests.js
index 37427e7a0b0..a5ec9923362 100644
--- a/addons/web/static/tests/legacy/views/abstract_view_tests.js
+++ b/addons/web/static/tests/legacy/views/abstract_view_tests.js
@@ -1,15 +1,11 @@
odoo.define('web.abstract_view_tests', function (require) {
"use strict";
-var AbstractView = require('web.AbstractView');
-var ajax = require('web.ajax');
-var testUtils = require('web.test_utils');
const { registry } = require('@web/core/registry');
const legacyViewRegistry = require('web.view_registry');
var ListView = require('web.ListView');
const { createWebClient, doAction } = require('@web/../tests/webclient/helpers');
-var createView = testUtils.createView;
QUnit.module('LegacyViews', {
beforeEach: function () {
@@ -34,91 +30,6 @@ QUnit.module('LegacyViews', {
QUnit.module('AbstractView');
- QUnit.test('lazy loading of js libs (in parallel)', async function (assert) {
- var done = assert.async();
- assert.expect(6);
-
- var prom = testUtils.makeTestPromise();
- var loadJS = ajax.loadJS;
- const libraryLoadingStartedPromise = testUtils.makeTestPromise();
-
- var View = AbstractView.extend({
- jsLibs: [['a', 'b']],
- });
- createView({
- View: View,
- arch: '
',
- data: this.data,
- model: 'fake_model',
- mockFetch: function (url) {
- libraryLoadingStartedPromise.resolve();
- assert.step(url);
- return prom.then(function () {
- assert.step(url + ' loaded');
- return true;
- });
- },
- }).then(function (view) {
- assert.verifySteps(['a loaded', 'b loaded'],
- "should wait for both libs to be loaded");
- ajax.loadJS = loadJS;
- view.destroy();
- done();
- });
-
- await libraryLoadingStartedPromise;
- assert.verifySteps(['a', 'b'], "both libs should be loaded in parallel");
- prom.resolve();
- });
-
- QUnit.test('lazy loading of js libs (sequentially)', async function (assert) {
- var done = assert.async();
- assert.expect(10);
-
- var proms = {
- a: testUtils.makeTestPromise(),
- b: testUtils.makeTestPromise(),
- c: testUtils.makeTestPromise(),
- };
- var loadJS = ajax.loadJS;
- const libraryLoadingStartedPromise = testUtils.makeTestPromise();
-
- var View = AbstractView.extend({
- jsLibs: [
- ['a', 'b'],
- 'c',
- ],
- });
- createView({
- View: View,
- arch: '
',
- data: this.data,
- model: 'fake_model',
- mockFetch: function (url) {
- libraryLoadingStartedPromise.resolve();
- assert.step(url);
- return proms[url].then(function () {
- assert.step(url + ' loaded');
- return true;
- });
- },
- }).then(function (view) {
- assert.verifySteps(['c loaded'], "should wait for all libs to be loaded");
- ajax.loadJS = loadJS;
- view.destroy();
- done();
- });
- await libraryLoadingStartedPromise;
- assert.verifySteps(['a', 'b'], "libs 'a' and 'b' should be loaded in parallel");
- await proms.b.resolve();
- await testUtils.nextTick();
- assert.verifySteps(['b loaded'], "should wait for 'a' and 'b' to be loaded before loading 'c'");
- await proms.a.resolve();
- await testUtils.nextTick();
- assert.verifySteps(['a loaded', 'c'], "should load 'c' when 'a' and 'b' are loaded");
- await proms.c.resolve();
- });
-
QUnit.test('group_by from context can be a string, instead of a list of strings', async function (assert) {
assert.expect(1);
diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py
index ca60cd7d040..84790d04101 100644
--- a/addons/web_editor/__manifest__.py
+++ b/addons/web_editor/__manifest__.py
@@ -22,12 +22,6 @@ Odoo Web Editor widget.
# MAIN BUNDLES
#----------------------------------------------------------------------
- 'web.assets_qweb': [
- ('include', 'web_editor.assets_media_dialog_templates'),
- 'web_editor/static/src/xml/*.xml',
- 'web_editor/static/src/components/**/*.xml',
- 'web_editor/static/src/js/backend/**/*',
- ],
'web_editor.assets_wysiwyg': [
# lib
'web_editor/static/lib/cropperjs/cropper.css',
@@ -87,18 +81,14 @@ Odoo Web Editor widget.
# Launcher
'web_editor/static/src/js/wysiwyg/wysiwyg.js',
'web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js',
- ],
- # TODO: Move those dialog assets in assets_common and make the public
- # root fetch templates from the common assets
- 'web_editor.assets_media_dialog_templates': [
- 'web_editor/static/src/components/media_dialog/*.xml',
- 'web_editor/static/src/components/upload_progress_toast/*.xml',
+
+ 'web_editor/static/src/xml/editor.xml',
+ 'web_editor/static/src/xml/snippets.xml',
+ 'web_editor/static/src/xml/wysiwyg.xml',
+ 'web_editor/static/src/xml/wysiwyg_colorpicker.xml',
],
'web_editor.assets_media_dialog': [
- 'web_editor/static/src/components/media_dialog/*.js',
- 'web_editor/static/src/components/media_dialog/*.scss',
- 'web_editor/static/src/components/upload_progress_toast/*.js',
- 'web_editor/static/src/components/upload_progress_toast/*.scss',
+ 'web_editor/static/src/components/**/*',
],
'web_editor.assets_tests_styles': [
'web_editor/static/src/js/editor/odoo-editor/src/base_style.scss',
@@ -110,6 +100,7 @@ Odoo Web Editor widget.
'web_editor/static/src/js/common/**/*',
'web_editor/static/src/js/editor/odoo-editor/src/utils/utils.js',
'web_editor/static/src/js/wysiwyg/fonts.js',
+ 'web_editor/static/src/xml/ace.xml',
],
'web.assets_backend': [
('include', 'web_editor.assets_media_dialog'),
@@ -120,12 +111,12 @@ Odoo Web Editor widget.
'web_editor/static/src/js/wysiwyg/dialog.js',
'web_editor/static/src/js/frontend/loader.js',
'web_editor/static/src/js/backend/**/*',
+ 'web_editor/static/src/xml/backend.xml',
],
'web.assets_frontend_minimal': [
'web_editor/static/src/js/frontend/loader_loading.js',
],
'web.assets_frontend': [
- ('include', 'web_editor.assets_media_dialog_templates'),
('include', 'web_editor.assets_media_dialog'),
'web_editor/static/src/scss/web_editor.common.scss',
diff --git a/addons/web_editor/static/src/js/common/ace.js b/addons/web_editor/static/src/js/common/ace.js
index 313d2d6026c..2322520e77a 100644
--- a/addons/web_editor/static/src/js/common/ace.js
+++ b/addons/web_editor/static/src/js/common/ace.js
@@ -143,7 +143,6 @@ function formatSCSS(scss) {
*/
var ViewEditor = Widget.extend({
template: 'web_editor.ace_view_editor',
- xmlDependencies: ['/web_editor/static/src/xml/ace.xml'],
jsLibs: [
'/web/static/lib/ace/ace.js',
[
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index 4b1f5320ad3..97aa04f1424 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -130,7 +130,6 @@ var globalSelector = {
*/
var SnippetEditor = Widget.extend({
template: 'web_editor.snippet_overlay',
- xmlDependencies: ['/web_editor/static/src/xml/snippets.xml'],
events: {
'click .oe_snippet_remove': '_onRemoveClick',
'wheel': '_onMouseWheel',
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index 37b7dafb895..548b7fbc14e 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -6978,8 +6978,6 @@ registry.BackgroundShape = SnippetOptionWidget.extend({
* Handles the edition of snippets' background image position.
*/
registry.BackgroundPosition = SnippetOptionWidget.extend({
- xmlDependencies: ['/web_editor/static/src/xml/editor.xml'],
-
/**
* @override
*/
@@ -7490,8 +7488,6 @@ registry.many2one = SnippetOptionWidget.extend({
* Allows to display a warning message on outdated snippets.
*/
registry.VersionControl = SnippetOptionWidget.extend({
- xmlDependencies: ['/web_editor/static/src/xml/snippets.xml'],
-
/**
* @override
*/
@@ -7513,7 +7509,6 @@ registry.VersionControl = SnippetOptionWidget.extend({
* Handle the save of a snippet as a template that can be reused later
*/
registry.SnippetSave = SnippetOptionWidget.extend({
- xmlDependencies: ['/web_editor/static/src/xml/editor.xml'],
isTopOption: true,
//--------------------------------------------------------------------------
diff --git a/addons/web_editor/static/src/js/editor/toolbar.js b/addons/web_editor/static/src/js/editor/toolbar.js
index 8c72783cbbf..11ccc9c1743 100644
--- a/addons/web_editor/static/src/js/editor/toolbar.js
+++ b/addons/web_editor/static/src/js/editor/toolbar.js
@@ -4,8 +4,6 @@ odoo.define('web_editor.toolbar', function (require) {
var Widget = require('web.Widget');
const Toolbar = Widget.extend({
- xmlDependencies: ['/web_editor/static/src/xml/editor.xml'],
-
/**
* @constructor
* @param {Widget} parent
diff --git a/addons/web_editor/static/src/js/frontend/loader.js b/addons/web_editor/static/src/js/frontend/loader.js
index 74c41c3c3c4..fbe6e2dfca7 100644
--- a/addons/web_editor/static/src/js/frontend/loader.js
+++ b/addons/web_editor/static/src/js/frontend/loader.js
@@ -1,14 +1,16 @@
odoo.define('web_editor.loader', function (require) {
'use strict';
-var ajax = require('web.ajax');
-
-let wysiwygPromises = {};
+const { getBundle, loadBundle } = require('@web/core/assets');
const exports = {};
-function loadWysiwyg(additionnalAssets=[]) {
- return ajax.loadLibs({assetLibs: ['web_editor.compiled_assets_wysiwyg', ...additionnalAssets]}, undefined, '/web_editor/public_render_template');
+async function loadWysiwyg(additionnalAssets=[]) {
+ const xmlids = ['web_editor.assets_wysiwyg', ...additionnalAssets];
+ for (const xmlid of xmlids) {
+ const assets = await getBundle(xmlid);
+ await loadBundle(assets);
+ }
}
exports.loadWysiwyg = loadWysiwyg;
@@ -27,25 +29,10 @@ exports.createWysiwyg = async (parent, options = {}) => {
};
async function getWysiwygClass({moduleName = 'web_editor.wysiwyg', additionnalAssets = []} = {}) {
- if (!wysiwygPromises[moduleName]) {
- wysiwygPromises[moduleName] = new Promise(async (resolve) => {
- if (odoo.__DEBUG__.services[moduleName]) {
- return resolve();
- }
- await loadWysiwyg(additionnalAssets);
- // Wait the loading of the service and his dependencies (use string to
- // avoid parsing of require function).
- const stringFunction = `return new Promise(resolve => {
- odoo.define('${moduleName}.loaded', require => {
- ` + 'require' + `('${moduleName}');
- resolve();
- });
- });`;
- await new Function(stringFunction)();
- resolve();
- });
+ if (!(await odoo.ready(moduleName))) {
+ await loadWysiwyg(additionnalAssets);
+ await odoo.ready(moduleName);
}
- await wysiwygPromises[moduleName];
return odoo.__DEBUG__.services[moduleName];
}
exports.getWysiwygClass = getWysiwygClass;
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js
index 3668636c33a..21b1119df46 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js
@@ -11,10 +11,6 @@ var _t = core._t;
*/
var AltDialog = Dialog.extend({
template: 'wysiwyg.widgets.alt',
- xmlDependencies: Dialog.prototype.xmlDependencies.concat(
- ['/web_editor/static/src/xml/wysiwyg.xml']
- ),
-
/**
* @constructor
*/
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/color_palette.js b/addons/web_editor/static/src/js/wysiwyg/widgets/color_palette.js
index a18ec70afda..bd56abf1e40 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/color_palette.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/color_palette.js
@@ -1,20 +1,15 @@
odoo.define('web_editor.ColorPalette', function (require) {
'use strict';
-const ajax = require('web.ajax');
-const core = require('web.core');
const session = require('web.session');
const {ColorpickerWidget} = require('web.Colorpicker');
const Widget = require('web.Widget');
const customColors = require('web_editor.custom_colors');
const weUtils = require('web_editor.utils');
-const qweb = core.qweb;
-
let colorpickerArch;
const ColorPaletteWidget = Widget.extend({
- // ! for xmlDependencies, see loadDependencies function
template: 'web_editor.snippet.option.colorpicker',
events: {
'click .o_we_color_btn': '_onColorButtonClick',
@@ -1008,8 +1003,6 @@ const ColorPaletteWidget = Widget.extend({
*/
let colorpickerTemplateProm;
ColorPaletteWidget.loadDependencies = async function (rpcCapableObj) {
- const proms = [ajax.loadXML('/web_editor/static/src/xml/snippets.xml', qweb)];
-
// Public user using the editor may have a colorpalette but with
// the default wysiwyg ones.
if (!session.is_website_user) {
@@ -1021,10 +1014,8 @@ ColorPaletteWidget.loadDependencies = async function (rpcCapableObj) {
args: ['web_editor.colorpicker', {}],
}).then(arch => colorpickerArch = arch);
}
- proms.push(colorpickerTemplateProm);
+ return colorpickerTemplateProm;
}
-
- return Promise.all(proms);
};
return {
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/image_crop_widget.js b/addons/web_editor/static/src/js/wysiwyg/widgets/image_crop_widget.js
index f8205b47f3b..cbb418c5dd1 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/image_crop_widget.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/image_crop_widget.js
@@ -9,7 +9,6 @@ const _t = core._t;
const ImageCropWidget = Widget.extend({
template: ['wysiwyg.widgets.crop'],
- xmlDependencies: ['/web_editor/static/src/xml/wysiwyg.xml'],
events: {
'click.crop_options [data-action]': '_onCropOptionClick',
// zoom event is triggered by the cropperjs library when the user zooms.
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link.js
index e5bd1109470..205ed485ce4 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/link.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link.js
@@ -14,7 +14,6 @@ const _t = core._t;
* Allows to customize link content and style.
*/
const Link = Widget.extend({
- xmlDependencies: ['/web_editor/static/src/xml/wysiwyg.xml'],
events: {
'input': '_onAnyChange',
'change': '_onAnyChange',
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
index 268705a5f88..ce402e754ab 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
@@ -7,7 +7,6 @@ import { ancestors } from '@web_editor/js/common/wysiwyg_utils';
const LinkPopoverWidget = Widget.extend({
template: 'wysiwyg.widgets.link.edit.tooltip',
- xmlDependencies: ['/web_editor/static/src/xml/wysiwyg.xml'],
events: {
'click .o_we_remove_link': '_onRemoveLinkClick',
'click .o_we_edit_link': '_onEditLinkClick',
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 739be6e54b4..b3feab5dd75 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -64,8 +64,6 @@ const PTP_CLIENT_DISCONNECTED_STATES = [
];
const Wysiwyg = Widget.extend({
- xmlDependencies: [
- ],
defaultOptions: {
lang: 'odoo',
colors: customColors,
diff --git a/addons/web_unsplash/__manifest__.py b/addons/web_unsplash/__manifest__.py
index 034dc2dbb23..e593cea6a4d 100644
--- a/addons/web_unsplash/__manifest__.py
+++ b/addons/web_unsplash/__manifest__.py
@@ -15,11 +15,9 @@
'web.assets_frontend': [
'web_unsplash/static/src/js/unsplash_beacon.js',
],
- 'web_editor.assets_media_dialog_templates': [
- 'web_unsplash/static/src/components/media_dialog/*.xml',
- ],
'web_editor.assets_media_dialog': [
'web_unsplash/static/src/components/media_dialog/*.js',
+ 'web_unsplash/static/src/components/media_dialog/*.xml',
'web_unsplash/static/src/services/unsplash_service.js',
],
},
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index e232a5d55e1..da59d30723c 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -31,7 +31,6 @@
'data/website_data.xml',
'data/website_visitor_cron.xml',
'data/digest_data.xml',
- 'views/assets.xml',
'views/website_templates.xml',
'views/snippets/snippets.xml',
'views/snippets/s_title.xml',
@@ -129,6 +128,9 @@
'website/static/src/js/post_link.js',
'website/static/src/js/plausible.js',
'website/static/src/js/user_custom_javascript.js',
+ 'website/static/src/xml/website.xml',
+ 'website/static/src/xml/website.background.video.xml',
+ 'website/static/src/xml/website.share.xml',
],
'web.assets_frontend_minimal': [
'website/static/src/js/content/inject_dom.js',
@@ -160,19 +162,18 @@
'website/static/src/scss/color_palettes.scss',
'website/static/src/scss/view_hierarchy.scss',
'website/static/src/scss/website.backend.scss',
+ 'website/static/src/xml/website.backend.xml',
'website/static/src/scss/website_visitor_views.scss',
'website/static/src/scss/website.theme_install.scss',
'website/static/src/js/backend/**/*',
- 'website/static/src/client_actions/*/*.js',
+ 'website/static/src/client_actions/*/*',
('remove', 'website/static/src/client_actions/website_preview/website_preview_test_mode.js'),
- 'website/static/src/client_actions/*/*.scss',
- 'website/static/src/components/fields/*.js',
- 'website/static/src/components/fields/*.scss',
+ 'website/static/src/components/fields/*',
'website/static/src/components/fullscreen_indication/fullscreen_indication.js',
'website/static/src/components/fullscreen_indication/fullscreen_indication.scss',
'website/static/src/components/website_loader/website_loader.js',
'website/static/src/components/website_loader/website_loader.scss',
- 'website/static/src/components/views/*.js',
+ 'website/static/src/components/views/*',
'website/static/src/services/website_service.js',
'website/static/src/js/utils.js',
],
@@ -202,7 +203,10 @@
'website/static/src/js/editor/snippets.options.js',
'website/static/src/snippets/s_facebook_page/options.js',
'website/static/src/snippets/s_image_gallery/options.js',
+ 'website/static/src/snippets/s_image_gallery/000.xml',
'website/static/src/snippets/s_countdown/options.js',
+ 'website/static/src/snippets/s_countdown/000.xml',
+ 'website/static/src/snippets/s_countdown/options.xml',
'website/static/src/snippets/s_masonry_block/options.js',
'website/static/src/snippets/s_popup/options.js',
'website/static/src/snippets/s_product_catalog/options.js',
@@ -218,15 +222,22 @@
'website/static/src/snippets/s_google_map/options.js',
'website/static/src/snippets/s_map/options.js',
'website/static/src/snippets/s_dynamic_snippet/options.js',
+ 'website/static/src/snippets/s_dynamic_snippet/000.xml',
'website/static/src/snippets/s_dynamic_snippet_carousel/options.js',
+ 'website/static/src/snippets/s_dynamic_snippet_carousel/000.xml',
'website/static/src/snippets/s_embed_code/options.js',
'website/static/src/snippets/s_website_form/options.js',
+ 'website/static/src/xml/website_form.xml',
+ 'website/static/src/xml/website.editor.xml',
+ 'website/static/src/xml/website_form_editor.xml',
'website/static/src/snippets/s_searchbar/options.js',
+ 'website/static/src/snippets/s_searchbar/000.xml',
'website/static/src/snippets/s_social_media/options.js',
'website/static/src/snippets/s_process_steps/options.js',
'website/static/src/js/editor/wysiwyg.js',
'website/static/src/js/editor/widget_link.js',
'website/static/src/js/widgets/link_popover_widget.js',
+ 'website/static/src/xml/website.cookies_bar.xml',
],
'web_editor.assets_media_dialog': [
'website/static/src/components/media_dialog/image_selector.js',
@@ -239,8 +250,10 @@
'website/static/src/components/ace_editor/ace_editor.scss',
'website/static/src/components/dialog/*.js',
'website/static/src/components/dialog/*.scss',
+ 'website/static/src/components/dialog/*.xml',
'website/static/src/components/editor/editor.js',
'website/static/src/components/editor/editor.scss',
+ 'website/static/src/components/editor/editor.xml',
'website/static/src/components/navbar/navbar.js',
'website/static/src/components/burger_menu/burger_menu.js',
'website/static/src/components/switch/switch.js',
@@ -249,23 +262,15 @@
'website/static/src/components/wysiwyg_adapter/page_options.js',
'website/static/src/components/translator/translator.js',
'website/static/src/components/translator/translator.scss',
+ 'website/static/src/components/translator/translator.xml',
'website/static/src/js/form_editor_registry.js',
'website/static/src/js/new_content_form.js',
'website/static/src/services/website_custom_menus.js',
'website/static/src/js/tours/homepage.js',
- 'website/static/src/systray_items/*.js',
- 'website/static/src/systray_items/*.scss',
- ],
- 'web.assets_qweb': [
+ 'website/static/src/systray_items/*',
+ 'web_editor/static/src/xml/editor.xml',
'website/static/src/client_actions/*/*.xml',
- 'website/static/src/components/dialog/*.xml',
- 'website/static/src/components/editor/editor.xml',
- 'website/static/src/components/fields/*.xml',
- 'website/static/src/components/translator/*.xml',
'website/static/src/components/website_loader/*.xml',
- 'website/static/src/components/views/*.xml',
- 'website/static/src/systray_items/*.xml',
- 'website/static/src/xml/website.backend.xml',
'website/static/src/js/backend/**/*',
],
'website.test_bundle': [
diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js
index b9b51aad3f1..dbe831c9db7 100644
--- a/addons/website/static/src/js/backend/dashboard.js
+++ b/addons/website/static/src/js/backend/dashboard.js
@@ -2,7 +2,7 @@ odoo.define('website.backend.dashboard', function (require) {
'use strict';
var AbstractAction = require('web.AbstractAction');
-var ajax = require('web.ajax');
+const { loadBundle } = require("@web/core/assets");
var core = require('web.core');
var field_utils = require('web.field_utils');
var pyUtils = require('web.py_utils');
@@ -53,7 +53,7 @@ var Dashboard = AbstractAction.extend({
willStart: function() {
var self = this;
- return Promise.all([ajax.loadLibs(this), this._super()]).then(function() {
+ return Promise.all([loadBundle(this), this._super()]).then(function() {
return self.fetch_data();
}).then(function(){
var website = _.findWhere(self.websites, {selected: true});
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
index 9da6095e413..f45fe4445f2 100644
--- a/addons/website/static/src/js/content/snippets.animation.js
+++ b/addons/website/static/src/js/content/snippets.animation.js
@@ -5,7 +5,7 @@ odoo.define('website.content.snippets.animation', function (require) {
* Provides a way to start JS code for snippets' initialization and animations.
*/
-const ajax = require('web.ajax');
+const { loadJS } = require('@web/core/assets');
var Class = require('web.Class');
var config = require('web.config');
var core = require('web.core');
@@ -624,7 +624,7 @@ const MobileYoutubeAutoplayMixin = {
return resolve();
};
});
- ajax.loadJS('https://www.youtube.com/iframe_api');
+ loadJS('https://www.youtube.com/iframe_api');
}
return promise;
@@ -725,7 +725,6 @@ registry.mediaVideo = publicWidget.Widget.extend(MobileYoutubeAutoplayMixin, {
registry.backgroundVideo = publicWidget.Widget.extend(MobileYoutubeAutoplayMixin, {
selector: '.o_background_video',
- xmlDependencies: ['/website/static/src/xml/website.background.video.xml'],
disabledInEditableMode: false,
/**
@@ -849,7 +848,6 @@ registry.backgroundVideo = publicWidget.Widget.extend(MobileYoutubeAutoplayMixin
registry.socialShare = publicWidget.Widget.extend({
selector: '.oe_social_share',
- xmlDependencies: ['/website/static/src/xml/website.share.xml'],
events: {
'mouseenter': '_onMouseEnter',
},
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js
index 9f8fc815788..2190d838e34 100644
--- a/addons/website/static/src/js/content/website_root.js
+++ b/addons/website/static/src/js/content/website_root.js
@@ -1,6 +1,6 @@
/** @odoo-module alias=website.root */
-import ajax from 'web.ajax';
+import { loadJS } from "@web/core/assets";
import { _t } from 'web.core';
import KeyboardNavigationMixin from 'web.KeyboardNavigationMixin';
import {Markup} from 'web.utils';
@@ -141,7 +141,7 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend(KeyboardNavigationMi
this._gmapAPILoading = false;
return;
}
- await ajax.loadJS(`https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&callback=odoo_gmap_api_post_load&key=${key}`);
+ await loadJS(`https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&callback=odoo_gmap_api_post_load&key=${key}`);
});
}
return this._gmapAPILoading;
diff --git a/addons/website/static/src/js/editor/snippets.editor.js b/addons/website/static/src/js/editor/snippets.editor.js
index 98f9b10c1c2..8b1d907bec9 100644
--- a/addons/website/static/src/js/editor/snippets.editor.js
+++ b/addons/website/static/src/js/editor/snippets.editor.js
@@ -12,8 +12,6 @@ const getTraversedNodes = OdooEditorLib.getTraversedNodes;
const FontFamilyPickerUserValueWidget = wSnippetOptions.FontFamilyPickerUserValueWidget;
const wSnippetMenu = weSnippetEditor.SnippetsMenu.extend({
- xmlDependencies: (weSnippetEditor.SnippetsMenu.prototype.xmlDependencies || [])
- .concat(['/website/static/src/xml/website.editor.xml']),
events: _.extend({}, weSnippetEditor.SnippetsMenu.prototype.events, {
'click .o_we_customize_theme_btn': '_onThemeTabClick',
'click .o_we_animate_text': '_onAnimateTextClick',
diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index 864aacdb860..46502c0130f 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -4,6 +4,7 @@ odoo.define('website.editor.snippets.options', function (require) {
const {ColorpickerWidget} = require('web.Colorpicker');
var core = require('web.core');
+const { loadBundle } = require("@web/core/assets");
var Dialog = require('web.Dialog');
const {Markup, sprintf} = require('web.utils');
const weUtils = require('web_editor.utils');
@@ -100,8 +101,6 @@ const UrlPickerUserValueWidget = InputUserValueWidget.extend({
});
const FontFamilyPickerUserValueWidget = SelectUserValueWidget.extend({
- xmlDependencies: (SelectUserValueWidget.prototype.xmlDependencies || [])
- .concat(['/website/static/src/xml/website.editor.xml']),
events: _.extend({}, SelectUserValueWidget.prototype.events || {}, {
'click .o_we_add_google_font_btn': '_onAddGoogleFontClick',
'click .o_we_delete_google_font_btn': '_onDeleteGoogleFontClick',
@@ -399,8 +398,6 @@ options.userValueWidgetsRegistry['we-gpspicker'] = GPSPicker;
//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
options.Class.include({
- xmlDependencies: (options.Class.prototype.xmlDependencies || [])
- .concat(['/website/static/src/xml/website.editor.xml']),
custom_events: _.extend({}, options.Class.prototype.custom_events || {}, {
'google_fonts_custo_request': '_onGoogleFontsCustoRequest',
}),
@@ -1117,7 +1114,7 @@ options.registry.OptionsTab = options.Class.extend({
* @see this.selectClass for parameters
*/
async openCustomCodeDialog(previewMode, widgetValue, params) {
- const libsProm = this._loadLibs({
+ const libsProm = loadBundle({
jsLibs: [
'/web/static/lib/ace/ace.js',
'/web/static/lib/ace/mode-xml.js',
@@ -2526,10 +2523,6 @@ options.registry.HeaderBox = options.registry.Box.extend({
});
options.registry.CookiesBar = options.registry.SnippetPopup.extend({
- xmlDependencies: (options.registry.SnippetPopup.prototype.xmlDependencies || []).concat(
- ['/website/static/src/xml/website.cookies_bar.xml']
- ),
-
//--------------------------------------------------------------------------
// Options
//--------------------------------------------------------------------------
diff --git a/addons/website/static/src/js/editor/widget_link.js b/addons/website/static/src/js/editor/widget_link.js
index 0006095c4e8..fa846c0a962 100644
--- a/addons/website/static/src/js/editor/widget_link.js
+++ b/addons/website/static/src/js/editor/widget_link.js
@@ -5,9 +5,6 @@ var weWidgets = require('wysiwyg.widgets');
var wUtils = require('website.utils');
weWidgets.LinkTools.include({
- xmlDependencies: (weWidgets.LinkTools.prototype.xmlDependencies || []).concat(
- ['/website/static/src/xml/website.editor.xml']
- ),
events: _.extend({}, weWidgets.LinkTools.prototype.events || {}, {
'click we-selection-items[name="link_anchor"] we-button': '_onAnchorChange',
'input input[name="url"]': '_onURLInput',
diff --git a/addons/website/static/src/js/utils.js b/addons/website/static/src/js/utils.js
index ed9e9c52691..75cef2c55c2 100644
--- a/addons/website/static/src/js/utils.js
+++ b/addons/website/static/src/js/utils.js
@@ -1,7 +1,6 @@
odoo.define('website.utils', function (require) {
'use strict';
-var ajax = require('web.ajax');
var core = require('web.core');
const { qweb, _t } = core;
@@ -165,10 +164,8 @@ function prompt(options, _qweb) {
text: options
};
}
- var xmlDef;
if (_.isUndefined(_qweb)) {
_qweb = 'website.prompt';
- xmlDef = ajax.loadXML('/website/static/src/xml/website.xml', core.qweb);
}
options = _.extend({
window_title: '',
@@ -185,50 +182,48 @@ function prompt(options, _qweb) {
options.field_name = options.field_name || options[type];
var def = new Promise(function (resolve, reject) {
- Promise.resolve(xmlDef).then(function () {
- var dialog = $(qweb.render(_qweb, options)).appendTo('body');
- options.$dialog = dialog;
- var field = dialog.find(options.field_type).first();
- field.val(options['default']); // dict notation for IE<9
- field.fillWith = function (data) {
- if (field.is('select')) {
- var select = field[0];
- data.forEach(function (item) {
- select.options[select.options.length] = new window.Option(item[1], item[0]);
- });
- } else {
- field.val(data);
- }
- };
- var init = options.init(field, dialog);
- Promise.resolve(init).then(function (fill) {
- if (fill) {
- field.fillWith(fill);
- }
- dialog.modal('show');
- field.focus();
- dialog.on('click', '.btn-primary', function () {
- var backdrop = $('.modal-backdrop');
- resolve({ val: field.val(), field: field, dialog: dialog });
- dialog.modal('hide').remove();
- backdrop.remove();
+ var dialog = $(qweb.render(_qweb, options)).appendTo('body');
+ options.$dialog = dialog;
+ var field = dialog.find(options.field_type).first();
+ field.val(options['default']); // dict notation for IE<9
+ field.fillWith = function (data) {
+ if (field.is('select')) {
+ var select = field[0];
+ data.forEach(function (item) {
+ select.options[select.options.length] = new window.Option(item[1], item[0]);
});
- });
- dialog.on('hidden.bs.modal', function () {
- var backdrop = $('.modal-backdrop');
- reject();
- dialog.remove();
+ } else {
+ field.val(data);
+ }
+ };
+ var init = options.init(field, dialog);
+ Promise.resolve(init).then(function (fill) {
+ if (fill) {
+ field.fillWith(fill);
+ }
+ dialog.modal('show');
+ field.focus();
+ dialog.on('click', '.btn-primary', function () {
+ var backdrop = $('.modal-backdrop');
+ resolve({ val: field.val(), field: field, dialog: dialog });
+ dialog.modal('hide').remove();
backdrop.remove();
});
- if (field.is('input[type="text"], select')) {
- field.keypress(function (e) {
- if (e.which === 13) {
- e.preventDefault();
- dialog.find('.btn-primary').trigger('click');
- }
- });
- }
});
+ dialog.on('hidden.bs.modal', function () {
+ var backdrop = $('.modal-backdrop');
+ reject();
+ dialog.remove();
+ backdrop.remove();
+ });
+ if (field.is('input[type="text"], select')) {
+ field.keypress(function (e) {
+ if (e.which === 13) {
+ e.preventDefault();
+ dialog.find('.btn-primary').trigger('click');
+ }
+ });
+ }
});
return def;
diff --git a/addons/website/static/src/services/website_service.js b/addons/website/static/src/services/website_service.js
index f2d72dea437..72762c44a45 100644
--- a/addons/website/static/src/services/website_service.js
+++ b/addons/website/static/src/services/website_service.js
@@ -1,8 +1,6 @@
/** @odoo-module **/
import { registry } from '@web/core/registry';
-import core from 'web.core';
-import ajax from 'web.ajax';
import { getWysiwygClass } from 'web_editor.loader';
import { FullscreenIndication } from '../components/fullscreen_indication/fullscreen_indication';
@@ -196,10 +194,9 @@ export const websiteService = {
},
async loadWysiwyg() {
if (!Wysiwyg) {
- await ajax.loadXML('/website/static/src/xml/website.editor.xml', core.qweb);
Wysiwyg = await getWysiwygClass({
moduleName: 'website.wysiwyg',
- additionnalAssets: ['website.compiled_assets_wysiwyg']
+ additionnalAssets: ['website.assets_wysiwyg']
});
}
return Wysiwyg;
diff --git a/addons/website/static/src/snippets/s_countdown/000.js b/addons/website/static/src/snippets/s_countdown/000.js
index e6b3d5560ae..56b8fe391db 100644
--- a/addons/website/static/src/snippets/s_countdown/000.js
+++ b/addons/website/static/src/snippets/s_countdown/000.js
@@ -11,7 +11,6 @@ const _t = core._t;
const CountdownWidget = publicWidget.Widget.extend({
selector: '.s_countdown',
- xmlDependencies: ['/website/static/src/snippets/s_countdown/000.xml'],
disabledInEditableMode: false,
/**
diff --git a/addons/website/static/src/snippets/s_countdown/options.js b/addons/website/static/src/snippets/s_countdown/options.js
index 1fefc35f86c..3c1c82a26d3 100644
--- a/addons/website/static/src/snippets/s_countdown/options.js
+++ b/addons/website/static/src/snippets/s_countdown/options.js
@@ -7,7 +7,6 @@ const options = require('web_editor.snippets.options');
const qweb = core.qweb;
options.registry.countdown = options.Class.extend({
- xmlDependencies: ['/website/static/src/snippets/s_countdown/options.xml'],
events: _.extend({}, options.Class.prototype.events || {}, {
'click .toggle-edit-message': '_onToggleEndMessageClick',
}),
diff --git a/addons/website/static/src/snippets/s_dynamic_snippet/000.js b/addons/website/static/src/snippets/s_dynamic_snippet/000.js
index 8d8b3f50812..4424ba0c078 100644
--- a/addons/website/static/src/snippets/s_dynamic_snippet/000.js
+++ b/addons/website/static/src/snippets/s_dynamic_snippet/000.js
@@ -8,7 +8,6 @@ const {Markup} = require('web.utils');
const DynamicSnippet = publicWidget.Widget.extend({
selector: '.s_dynamic_snippet',
- xmlDependencies: ['/website/static/src/snippets/s_dynamic_snippet/000.xml'],
read_events: {
'click [data-url]': '_onCallToAction',
},
diff --git a/addons/website/static/src/snippets/s_dynamic_snippet_carousel/000.js b/addons/website/static/src/snippets/s_dynamic_snippet_carousel/000.js
index 07962b41a77..adae0ab86bd 100644
--- a/addons/website/static/src/snippets/s_dynamic_snippet_carousel/000.js
+++ b/addons/website/static/src/snippets/s_dynamic_snippet_carousel/000.js
@@ -6,10 +6,6 @@ const DynamicSnippet = require('website.s_dynamic_snippet');
const DynamicSnippetCarousel = DynamicSnippet.extend({
selector: '.s_dynamic_snippet_carousel',
- xmlDependencies: (DynamicSnippet.prototype.xmlDependencies || []).concat(
- ['/website/static/src/snippets/s_dynamic_snippet_carousel/000.xml']
- ),
-
/**
* @override
*/
diff --git a/addons/website/static/src/snippets/s_embed_code/options.js b/addons/website/static/src/snippets/s_embed_code/options.js
index 07faab91e6a..cd05f628828 100644
--- a/addons/website/static/src/snippets/s_embed_code/options.js
+++ b/addons/website/static/src/snippets/s_embed_code/options.js
@@ -3,6 +3,7 @@
import Dialog from 'web.Dialog';
import core from 'web.core';
import options from 'web_editor.snippets.options';
+import { loadBundle } from "@web/core/assets";
const _t = core._t;
@@ -15,7 +16,7 @@ options.registry.EmbedCode = options.Class.extend({
const $container = this.$target.find('.s_embed_code_embedded');
const code = $container.html().trim();
- await this._loadLibs({
+ await loadBundle({
jsLibs: [
'/web/static/lib/ace/ace.js',
'/web/static/lib/ace/mode-xml.js',
diff --git a/addons/website/static/src/snippets/s_image_gallery/000.js b/addons/website/static/src/snippets/s_image_gallery/000.js
index 7a57302f6a9..2e778ce72de 100644
--- a/addons/website/static/src/snippets/s_image_gallery/000.js
+++ b/addons/website/static/src/snippets/s_image_gallery/000.js
@@ -9,7 +9,6 @@ var qweb = core.qweb;
const GalleryWidget = publicWidget.Widget.extend({
selector: '.s_image_gallery:not(.o_slideshow)',
- xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'],
events: {
'click img': '_onClickImg',
},
@@ -73,7 +72,6 @@ const GalleryWidget = publicWidget.Widget.extend({
const GallerySliderWidget = publicWidget.Widget.extend({
selector: '.o_slideshow',
- xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'],
disabledInEditableMode: false,
/**
diff --git a/addons/website/static/src/snippets/s_image_gallery/options.js b/addons/website/static/src/snippets/s_image_gallery/options.js
index d90cb1d44a1..070c2df6fd7 100644
--- a/addons/website/static/src/snippets/s_image_gallery/options.js
+++ b/addons/website/static/src/snippets/s_image_gallery/options.js
@@ -10,8 +10,6 @@ var _t = core._t;
var qweb = core.qweb;
options.registry.gallery = options.Class.extend({
- xmlDependencies: ['/website/static/src/snippets/s_image_gallery/000.xml'],
-
/**
* @override
*/
diff --git a/addons/website/static/src/snippets/s_searchbar/000.js b/addons/website/static/src/snippets/s_searchbar/000.js
index cf61bc6a758..8c04fa45827 100644
--- a/addons/website/static/src/snippets/s_searchbar/000.js
+++ b/addons/website/static/src/snippets/s_searchbar/000.js
@@ -8,7 +8,6 @@ import {Markup} from 'web.utils';
publicWidget.registry.searchBar = publicWidget.Widget.extend({
selector: '.o_searchbar_form',
- xmlDependencies: ['/website/static/src/snippets/s_searchbar/000.xml'],
events: {
'input .search-query': '_onInput',
'focusout': '_onFocusOut',
diff --git a/addons/website/static/src/snippets/s_website_form/000.js b/addons/website/static/src/snippets/s_website_form/000.js
index d89dc4419c9..ae537edd823 100644
--- a/addons/website/static/src/snippets/s_website_form/000.js
+++ b/addons/website/static/src/snippets/s_website_form/000.js
@@ -38,7 +38,6 @@ odoo.define('website.s_website_form', function (require) {
publicWidget.registry.s_website_form = publicWidget.Widget.extend({
selector: '.s_website_form form, form.s_website_form', // !compatibility
- xmlDependencies: ['/website/static/src/xml/website_form.xml'],
events: {
'click .s_website_form_send, .o_website_form_send': 'send', // !compatibility
},
@@ -488,7 +487,7 @@ odoo.define('website.s_website_form', function (require) {
}
// Note: we still need to wait that the widget is properly started
- // before any qweb rendering which depends on xmlDependencies
+ // before any qweb rendering which depends on xml assets
// because the event handlers are binded before the call to
// willStart for public widgets...
this.__started.then(() => $result.replaceWith(qweb.render(`website.s_website_form_status_${status}`, {
diff --git a/addons/website/static/src/snippets/s_website_form/options.js b/addons/website/static/src/snippets/s_website_form/options.js
index 23ec20cf08f..b4aef8c34e9 100644
--- a/addons/website/static/src/snippets/s_website_form/options.js
+++ b/addons/website/static/src/snippets/s_website_form/options.js
@@ -13,11 +13,6 @@ const qweb = core.qweb;
const _t = core._t;
const FormEditor = options.Class.extend({
- xmlDependencies: [
- '/website/static/src/xml/website_form_editor.xml',
- '/google_recaptcha/static/src/xml/recaptcha.xml',
- ],
-
//----------------------------------------------------------------------
// Private
//----------------------------------------------------------------------
diff --git a/addons/website/static/tests/tours/focus_blur_snippets.js b/addons/website/static/tests/tours/focus_blur_snippets.js
index 0ad72a498bb..5902c8eff09 100644
--- a/addons/website/static/tests/tours/focus_blur_snippets.js
+++ b/addons/website/static/tests/tours/focus_blur_snippets.js
@@ -1,7 +1,7 @@
odoo.define('website.tour.focus_blur_snippets', function (require) {
'use strict';
-const ajax = require('web.ajax');
+const { loadJS } = require('@web/core/assets');
const tour = require('web_tour.tour');
const blockIDToData = {
@@ -57,7 +57,7 @@ tour.register('focus_blur_snippets', {
content: 'First load our custom JS options',
trigger: '#oe_snippets.o_loaded',
run: function () {
- ajax.loadJS('/website/static/tests/tour_utils/focus_blur_snippets_options.js').then(function () {
+ loadJS('/website/static/tests/tour_utils/focus_blur_snippets_options.js').then(function () {
$('iframe:not(.o_ignore_in_tour)').contents().find('body').addClass('focus_blur_snippets_options_loaded');
});
},
diff --git a/addons/website/static/tests/tours/rte.js b/addons/website/static/tests/tours/rte.js
index 9d79d61196f..c516e790078 100644
--- a/addons/website/static/tests/tours/rte.js
+++ b/addons/website/static/tests/tours/rte.js
@@ -1,14 +1,13 @@
odoo.define('website.tour.rte', function (require) {
'use strict';
-var ajax = require('web.ajax');
var session = require('web.session');
const wTourUtils = require('website.tour_utils');
var domReady = new Promise(function (resolve) {
$(resolve);
});
-var ready = Promise.all([domReady, session.is_bound, ajax.loadXML()]);
+var ready = Promise.all([domReady, session.is_bound]);
wTourUtils.registerWebsitePreviewTour('rte_translator', {
test: true,
diff --git a/addons/website/views/snippets/s_searchbar.xml b/addons/website/views/snippets/s_searchbar.xml
index d6d7aab1849..4b7aad12872 100644
--- a/addons/website/views/snippets/s_searchbar.xml
+++ b/addons/website/views/snippets/s_searchbar.xml
@@ -64,4 +64,10 @@
website/static/src/snippets/s_searchbar/000.js
+
+ Searchbar 000 XML
+ web.assets_frontend
+ website/static/src/snippets/s_searchbar/000.xml
+
+
diff --git a/addons/website/views/snippets/s_website_form.xml b/addons/website/views/snippets/s_website_form.xml
index 6a734437bb5..09d1076432f 100644
--- a/addons/website/views/snippets/s_website_form.xml
+++ b/addons/website/views/snippets/s_website_form.xml
@@ -239,4 +239,10 @@
website/static/src/snippets/s_website_form/000.js
+
+ Website form XML
+ web.assets_frontend
+ website/static/src/xml/website_form.xml
+
+
diff --git a/addons/website_event_booth/__manifest__.py b/addons/website_event_booth/__manifest__.py
index 070e1b3bb62..ea934b28001 100644
--- a/addons/website_event_booth/__manifest__.py
+++ b/addons/website_event_booth/__manifest__.py
@@ -26,8 +26,6 @@ Display your booths on your website for the users to register.
'web.assets_frontend': [
'/website_event_booth/static/src/js/booth_register.js',
'/website_event_booth/static/src/scss/website_event_booth.scss',
- ],
- 'web.assets_qweb': [
'website_event_booth/static/src/xml/event_booth_registration_templates.xml',
],
},
diff --git a/addons/website_event_booth/static/src/js/booth_register.js b/addons/website_event_booth/static/src/js/booth_register.js
index 9c1415169a0..5123f86b42e 100644
--- a/addons/website_event_booth/static/src/js/booth_register.js
+++ b/addons/website_event_booth/static/src/js/booth_register.js
@@ -9,9 +9,6 @@ var _t = core._t;
publicWidget.registry.boothRegistration = publicWidget.Widget.extend({
selector: '.o_wbooth_registration',
- xmlDependencies: [
- '/website_event_booth/static/src/xml/event_booth_registration_templates.xml',
- ],
events: {
'change input[name="booth_category_id"]': '_onChangeBoothType',
'change .form-check > input[type="checkbox"]': '_onChangeBooth',
diff --git a/addons/website_event_exhibitor/__manifest__.py b/addons/website_event_exhibitor/__manifest__.py
index 3192d1b1474..b1462ca3122 100644
--- a/addons/website_event_exhibitor/__manifest__.py
+++ b/addons/website_event_exhibitor/__manifest__.py
@@ -37,6 +37,7 @@
'website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss',
'website_event_exhibitor/static/src/js/event_exhibitor_connect.js',
'website_event_exhibitor/static/src/js/event_sponsor_search.js',
+ 'website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml',
],
'web.report_assets_common': [
'/website_event_exhibitor/static/src/scss/event_full_page_ticket_report.scss',
diff --git a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
index 2d530fe4a74..3472e6f76d8 100644
--- a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
+++ b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
@@ -58,8 +58,6 @@ var ExhibitorConnectClosedDialog = Dialog.extend({
publicWidget.registry.eventExhibitorConnect = publicWidget.Widget.extend({
selector: '.o_wesponsor_connect_button',
- xmlDependencies: ['/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml'],
-
/**
* @override
* @public
diff --git a/addons/website_event_meet/__manifest__.py b/addons/website_event_meet/__manifest__.py
index c7a36646d83..a791f56b018 100644
--- a/addons/website_event_meet/__manifest__.py
+++ b/addons/website_event_meet/__manifest__.py
@@ -29,6 +29,7 @@
'website_event_meet/static/src/scss/event_meet_templates.scss',
'website_event_meet/static/src/js/website_event_meeting_room.js',
'website_event_meet/static/src/js/website_event_create_meeting_room_button.js',
+ 'website_event_meet/static/src/xml/website_event_meeting_room.xml',
],
'website.assets_wysiwyg': [
'website_event_meet/static/src/js/snippets/options.js',
diff --git a/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js b/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js
index c64537a57a7..ed6aefcff38 100644
--- a/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js
+++ b/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js
@@ -7,7 +7,6 @@ const QWeb = core.qweb;
publicWidget.registry.websiteEventCreateMeetingRoom = publicWidget.Widget.extend({
selector: '.o_wevent_create_room_button',
- xmlDependencies: ['/website_event_meet/static/src/xml/website_event_meeting_room.xml'],
events: {
'click': '_onClickCreate',
},
diff --git a/addons/website_event_meet/static/src/js/website_event_meeting_room.js b/addons/website_event_meet/static/src/js/website_event_meeting_room.js
index 774a186e9f7..39c11728415 100644
--- a/addons/website_event_meet/static/src/js/website_event_meeting_room.js
+++ b/addons/website_event_meet/static/src/js/website_event_meeting_room.js
@@ -8,7 +8,6 @@ const _t = core._t;
publicWidget.registry.websiteEventMeetingRoom = publicWidget.Widget.extend({
selector: '.o_wevent_meeting_room_card',
- xmlDependencies: ['/website_event_meet/static/src/xml/website_event_meeting_room.xml'],
events: {
'click .o_wevent_meeting_room_delete': '_onDeleteClick',
'click .o_wevent_meeting_room_duplicate': '_onDuplicateClick',
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index 5cc49d378a3..deca5c6ee5f 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -53,9 +53,8 @@
'website_event_track/static/src/js/event_track_timer.js',
'website_event_track/static/src/js/website_event_pwa_widget.js',
'website_event_track/static/lib/idb-keyval/idb-keyval.js',
- ],
- 'web.assets_qweb': [
'website_event_track/static/src/xml/event_track_proposal_templates.xml',
+ 'website_event_track/static/src/xml/website_event_pwa.xml',
],
},
'license': 'LGPL-3',
diff --git a/addons/website_event_track/static/src/js/website_event_pwa_widget.js b/addons/website_event_track/static/src/js/website_event_pwa_widget.js
index 49b42196b93..c343f6ff608 100644
--- a/addons/website_event_track/static/src/js/website_event_pwa_widget.js
+++ b/addons/website_event_track/static/src/js/website_event_pwa_widget.js
@@ -20,7 +20,6 @@ odoo.define("website_event_track.website_event_pwa_widget", function (require) {
var publicWidget = require("web.public.widget");
var PWAInstallBanner = publicWidget.Widget.extend({
- xmlDependencies: ["/website_event_track/static/src/xml/website_event_pwa.xml"],
template: "pwa_install_banner",
events: {
"click .o_btn_install": "_onClickInstall",
diff --git a/addons/website_event_track/static/src/js/website_event_track_proposal_form.js b/addons/website_event_track/static/src/js/website_event_track_proposal_form.js
index 4e01701c73f..6dff8848948 100644
--- a/addons/website_event_track/static/src/js/website_event_track_proposal_form.js
+++ b/addons/website_event_track/static/src/js/website_event_track_proposal_form.js
@@ -9,9 +9,6 @@ var _t = core._t;
publicWidget.registry.websiteEventTrackProposalForm = publicWidget.Widget.extend({
selector: '.o_website_event_track_proposal_form',
- xmlDependencies: [
- '/website_event_track/static/src/xml/event_track_proposal_templates.xml',
- ],
events: {
'click .o_wetrack_add_contact_information_checkbox': '_onAdvancedContactToggle',
'input input[name="partner_name"]': '_onPartnerNameInput',
diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py
index 5b6e356602d..f23070a2946 100644
--- a/addons/website_event_track_live/__manifest__.py
+++ b/addons/website_event_track_live/__manifest__.py
@@ -27,8 +27,6 @@
'website_event_track_live/static/src/js/website_event_track_replay_suggestion.js',
'website_event_track_live/static/src/js/website_event_track_suggestion.js',
'website_event_track_live/static/src/js/website_event_track_live.js',
- ],
- 'web.assets_qweb': [
'website_event_track_live/static/src/xml/**/*',
],
},
diff --git a/addons/website_event_track_live/static/src/js/website_event_track_replay_suggestion.js b/addons/website_event_track_live/static/src/js/website_event_track_replay_suggestion.js
index da96f91ecfe..db2350be388 100644
--- a/addons/website_event_track_live/static/src/js/website_event_track_replay_suggestion.js
+++ b/addons/website_event_track_live/static/src/js/website_event_track_replay_suggestion.js
@@ -10,7 +10,6 @@ var Widget = require('web.Widget');
*/
var WebsiteEventReplaySuggestion = Widget.extend({
template: 'website_event_track_live.website_event_track_replay_suggestion',
- xmlDependencies: ['/website_event_track_live/static/src/xml/website_event_track_live_templates.xml'],
events: {
'click .owevent_track_suggestion_replay': '_onReplayClick'
},
diff --git a/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js b/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js
index e6583c22509..4309fac363c 100644
--- a/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js
+++ b/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js
@@ -5,7 +5,6 @@ var Widget = require('web.Widget');
var WebsiteEventTrackSuggestion = Widget.extend({
template: 'website_event_track_live.website_event_track_suggestion',
- xmlDependencies: ['/website_event_track_live/static/src/xml/website_event_track_live_templates.xml'],
events: {
'click .owevent_track_suggestion_next': '_onNextTrackClick',
'click .owevent_track_suggestion_close': '_onCloseClick',
diff --git a/addons/website_event_track_live_quiz/__manifest__.py b/addons/website_event_track_live_quiz/__manifest__.py
index cf262fc27ec..44d2d31b7be 100644
--- a/addons/website_event_track_live_quiz/__manifest__.py
+++ b/addons/website_event_track_live_quiz/__manifest__.py
@@ -20,8 +20,6 @@
'assets': {
'web.assets_frontend': [
'website_event_track_live_quiz/static/src/js/**/*',
- ],
- 'web.assets_qweb': [
'website_event_track_live_quiz/static/src/xml/**/*',
],
},
diff --git a/addons/website_event_track_live_quiz/static/src/js/event_quiz.js b/addons/website_event_track_live_quiz/static/src/js/event_quiz.js
index 2fd34e66aa4..94dc35f5b9d 100644
--- a/addons/website_event_track_live_quiz/static/src/js/event_quiz.js
+++ b/addons/website_event_track_live_quiz/static/src/js/event_quiz.js
@@ -4,10 +4,6 @@ odoo.define('website_event_track_live_quiz.event_quiz', function (require) {
var Quiz = require('website_event_track_quiz.event.quiz');
var WebsiteEventTrackSuggestionQuiz = Quiz.include({
- xmlDependencies: Quiz.prototype.xmlDependencies.concat([
- '/website_event_track_live_quiz/static/src/xml/website_event_track_quiz_templates.xml',
- ]),
-
/**
* @override
*/
diff --git a/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js b/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js
index 17f98f9b7fd..28e6c559e75 100644
--- a/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js
+++ b/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js
@@ -4,9 +4,6 @@ odoo.define('website_event_track_live_quiz.website_event_track_suggestion', func
var WebsiteEventTrackSuggestion = require('website_event_track_live.website_event_track_suggestion');
var WebsiteEventTrackSuggestionLiveQuiz = WebsiteEventTrackSuggestion.include({
- xmlDependencies: WebsiteEventTrackSuggestion.prototype.xmlDependencies.concat([
- '/website_event_track_live_quiz/static/src/xml/website_event_track_live_templates.xml',
- ]),
events: _.extend({}, WebsiteEventTrackSuggestion.prototype.events, {
'click .owevent_track_suggestion_quiz': '_onQuizClick'
}),
diff --git a/addons/website_event_track_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py
index 97efe847c38..8b1598d676e 100644
--- a/addons/website_event_track_quiz/__manifest__.py
+++ b/addons/website_event_track_quiz/__manifest__.py
@@ -35,6 +35,7 @@
'website_event_track_quiz/static/src/scss/event_quiz.scss',
'website_event_track_quiz/static/src/js/event_quiz.js',
'website_event_track_quiz/static/src/js/event_quiz_leaderboard.js',
+ 'website_event_track_quiz/static/src/xml/quiz_templates.xml',
],
},
'license': 'LGPL-3',
diff --git a/addons/website_event_track_quiz/static/src/js/event_quiz.js b/addons/website_event_track_quiz/static/src/js/event_quiz.js
index 47331f11732..bee0cd44715 100644
--- a/addons/website_event_track_quiz/static/src/js/event_quiz.js
+++ b/addons/website_event_track_quiz/static/src/js/event_quiz.js
@@ -18,7 +18,6 @@ var _t = core._t;
*/
var Quiz = publicWidget.Widget.extend({
template: 'quiz.main',
- xmlDependencies: ['/website_event_track_quiz/static/src/xml/quiz_templates.xml'],
events: {
"click .o_quiz_quiz_answer": '_onAnswerClick',
"click .o_quiz_js_quiz_submit": '_submitQuiz',
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index f7606945dda..441a56e4305 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -55,10 +55,11 @@ Ask questions, get answers, no distractions
'website_forum/static/src/scss/website_forum.scss',
'website_forum/static/src/js/website_forum.js',
'website_forum/static/src/js/website_forum.share.js',
+ 'website_forum/static/src/xml/public_templates.xml',
],
- 'web.assets_qweb': [
- 'website_forum/static/src/xml/*.xml',
- ],
+ 'web_editor.assets_wysiwyg': {
+ 'website_forum/static/src/xml/forum_wysiwyg.xml',
+ },
},
'license': 'LGPL-3',
}
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index e97058bf320..a719c3cf0a3 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -14,10 +14,6 @@ var _t = core._t;
publicWidget.registry.websiteForum = publicWidget.Widget.extend({
selector: '.website_forum',
- xmlDependencies: [
- '/web_editor/static/src/xml/editor.xml',
- '/website_forum/static/src/xml/public_templates.xml',
- ],
events: {
'click .karma_required': '_onKarmaRequiredClick',
'mouseenter .o_js_forum_tag_follow': '_onTagFollowBoxMouseEnter',
@@ -556,7 +552,6 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({
publicWidget.registry.websiteForumSpam = publicWidget.Widget.extend({
selector: '.o_wforum_moderation_queue',
- xmlDependencies: ['/website_forum/static/src/xml/public_templates.xml'],
events: {
'click .o_wforum_select_all_spam': '_onSelectallSpamClick',
'click .o_wforum_mark_spam': 'async _onMarkSpamClick',
diff --git a/addons/website_forum/static/src/js/website_forum.share.js b/addons/website_forum/static/src/js/website_forum.share.js
index c26809a7b35..b489c227d45 100644
--- a/addons/website_forum/static/src/js/website_forum.share.js
+++ b/addons/website_forum/static/src/js/website_forum.share.js
@@ -3,14 +3,13 @@ odoo.define('website_forum.share', function (require) {
var core = require('web.core');
var publicWidget = require('web.public.widget');
+require('website.content.snippets.animation');
var qweb = core.qweb;
// FIXME There is no reason to inherit from socialShare here
var ForumShare = publicWidget.registry.socialShare.extend({
selector: '',
- xmlDependencies: publicWidget.registry.socialShare.prototype.xmlDependencies
- .concat(['/website_forum/static/src/xml/public_templates.xml']),
events: {},
/**
diff --git a/addons/website_forum/static/src/xml/forum_wysiwyg.xml b/addons/website_forum/static/src/xml/forum_wysiwyg.xml
new file mode 100644
index 00000000000..4c4b53e49c4
--- /dev/null
+++ b/addons/website_forum/static/src/xml/forum_wysiwyg.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_forum/static/src/xml/public_templates.xml b/addons/website_forum/static/src/xml/public_templates.xml
index 3c7970ac4d9..8ff9f41855a 100644
--- a/addons/website_forum/static/src/xml/public_templates.xml
+++ b/addons/website_forum/static/src/xml/public_templates.xml
@@ -68,17 +68,4 @@