[REF] *: definitely get rid of web_editor.base
* portal, sale, website, website_blog, website_crm, website_event, website_event_sale, website_forum, website_hr_recruitment, website_sale, website_sale_wishlist At last, that ugly JS module can be removed. Before this current PR, it was still used to wait for "page ready", to initialize widgets on page loading. Now, all can be done thanks to public root and public widgets. web_editor.base was also still used in tours, which should not be necessary anymore for the same reason, especially since the tour manager waits for the public root naturally. Part of https://github.com/odoo/odoo/pull/29442 task-1932066
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
odoo.define('web_editor.base', function (require) {
|
||||
'use strict';
|
||||
|
||||
var ajax = require('web.ajax');
|
||||
var session = require('web.session');
|
||||
|
||||
var domReady = $.Deferred();
|
||||
$(domReady.resolve.bind(domReady));
|
||||
|
||||
return {
|
||||
/**
|
||||
* If a widget needs to be instantiated on page loading, it needs to wait
|
||||
* for appropriate resources in order to be loaded. This function returns a
|
||||
* Deferred that is resolved when the dom is ready, the session is bound
|
||||
* (translations loaded) and the XML is loaded. This should however not be
|
||||
* necessary anymore as widgets should not be parentless and should then be
|
||||
* instantiated (directly or not) by the page's main component (webclient,
|
||||
* website root, editor bar, ...). The DOM will be ready then, the main
|
||||
* component is in charge of waiting for the session and the XML can be
|
||||
* lazy loaded thanks to the @see Widget.xmlDependencies key.
|
||||
*
|
||||
* @returns {Deferred}
|
||||
*/
|
||||
ready: function () {
|
||||
return $.when(domReady, session.is_bound, ajax.loadXML());
|
||||
},
|
||||
};
|
||||
});
|
||||
@@ -17,7 +17,6 @@
|
||||
<link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/portal.scss"/>
|
||||
</xpath>
|
||||
<xpath expr="//script[last()]" position="after">
|
||||
<script type="text/javascript" src="/portal/static/src/js/base.js"></script>
|
||||
<script type="text/javascript" src="/portal/static/src/js/portal.js"></script>
|
||||
<script type="text/javascript" src="/portal/static/src/js/portal_tour.js"></script>
|
||||
<script type="text/javascript" src="/portal/static/src/js/portal_chatter.js"></script>
|
||||
|
||||
@@ -2,13 +2,11 @@ odoo.define('sale.tour_sale_signature', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
// This tour relies on data created on the Python test.
|
||||
tour.register('sale_signature', {
|
||||
test: true,
|
||||
url: '/my/quotes',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website.test.html_editor', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
tour.register('html_editor_multiple_templates', {
|
||||
test: true,
|
||||
url: '/aboutus',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
// 1. Edit the page through Edit Mode, it will COW the view
|
||||
@@ -77,7 +75,6 @@ tour.register('html_editor_multiple_templates', {
|
||||
tour.register('test_html_editor_scss', {
|
||||
test: true,
|
||||
url: '/aboutus',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
// 1. Open Html Editor and select a scss file
|
||||
|
||||
@@ -3,13 +3,11 @@ odoo.define("website.tour.banner", function (require) {
|
||||
|
||||
var core = require("web.core");
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
var _t = core._t;
|
||||
|
||||
tour.register("banner", {
|
||||
url: "/",
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
trigger: "a[data-action=edit]",
|
||||
content: _t("<b>Click Edit</b> to start designing your homepage."),
|
||||
@@ -88,12 +86,10 @@ odoo.define("website.tour.contact", function (require) {
|
||||
|
||||
var core = require("web.core");
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
var _t = core._t;
|
||||
|
||||
tour.register("contact", {
|
||||
url: "/page/contactus",
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
trigger: "li#customize-menu",
|
||||
content: _t("<b>Install a contact form</b> to improve this page."),
|
||||
|
||||
@@ -3,13 +3,11 @@ odoo.define('website.tour.customize', function (require) {
|
||||
|
||||
var core = require('web.core');
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
var _t = core._t;
|
||||
|
||||
tour.register('theme_customize', {
|
||||
url: '/',
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
trigger: 'button.o_theme_customize_color_primary, button.o_theme_customize_color_alpha',
|
||||
content: _t("Click here to choose your main branding color.<br/>It will recompute the palette with suggested matching colors."),
|
||||
|
||||
@@ -3,13 +3,11 @@ odoo.define("website_blog.tour", function (require) {
|
||||
|
||||
var core = require("web.core");
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
var _t = core._t;
|
||||
|
||||
tour.register("blog", {
|
||||
url: "/",
|
||||
wait_for: base.ready(),
|
||||
}, [tour.STEPS.WEBSITE_NEW_PAGE, {
|
||||
trigger: "a[data-action=new_blog_post]",
|
||||
content: _t("Select this menu item to create a new blog post."),
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_crm.tour', function(require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
tour.register('website_crm_tour', {
|
||||
test: true,
|
||||
url: '/contactus',
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
content: "Complete name",
|
||||
trigger: "input[name=contact_name]",
|
||||
|
||||
@@ -3,13 +3,11 @@ odoo.define("website_event.tour", function (require) {
|
||||
|
||||
var core = require("web.core");
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
var _t = core._t;
|
||||
|
||||
tour.register("event", {
|
||||
url: "/",
|
||||
wait_for: base.ready(),
|
||||
}, [tour.STEPS.WEBSITE_NEW_PAGE, {
|
||||
trigger: "a[data-action=new_event]",
|
||||
content: _t("Click here to create a new event."),
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_event_sale.tour', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register('event_buy_tickets', {
|
||||
test: true,
|
||||
url: '/event',
|
||||
wait_for: base.ready()
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -3,13 +3,11 @@ odoo.define("website_forum.tour_forum", function (require) {
|
||||
|
||||
var core = require("web.core");
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
var _t = core._t;
|
||||
|
||||
tour.register("question", {
|
||||
url: "/",
|
||||
wait_for: base.ready(),
|
||||
}, [tour.STEPS.WEBSITE_NEW_PAGE, {
|
||||
trigger: "a[data-action=new_forum]",
|
||||
content: _t("Select this menu item to create a new forum."),
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_forum.tour_forum_question', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register('forum_question', {
|
||||
test: true,
|
||||
url: '/forum/help-1',
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
content: "Ask the question in this forum by clicking on the button.",
|
||||
trigger: '.btn-lg.btn-block',
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
odoo.define('website_hr_recruitment.tour', function(require) {
|
||||
'use strict';
|
||||
|
||||
var base = require('web_editor.base');
|
||||
var tour = require("web_tour.tour");
|
||||
|
||||
tour.register('website_hr_recruitment_tour', {
|
||||
test: true,
|
||||
url: '/jobs/apply/3',
|
||||
wait_for: base.ready(),
|
||||
}, [{
|
||||
content: "Complete name",
|
||||
trigger: "input[name=partner_name]",
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_sale.tour', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register('shop_buy_product', {
|
||||
test: true,
|
||||
url: '/shop',
|
||||
wait_for: base.ready()
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ odoo.define("website_sale.tour_shop", function (require) {
|
||||
var core = require("web.core");
|
||||
var _t = core._t;
|
||||
|
||||
// return the steps, used for backend and frontend (because web_editor.base is only in the website)
|
||||
// return the steps, used for backend and frontend
|
||||
|
||||
return [{
|
||||
trigger: "#new-content-menu > a",
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define("website_sale.tour_shop_custom_attribute_value", function (require)
|
||||
"use strict";
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register("shop_custom_attribute_value", {
|
||||
url: "/shop?search=Customizable Desk",
|
||||
test: true,
|
||||
wait_for: base.ready()
|
||||
}, [{
|
||||
content: "click on Customizable Desk",
|
||||
trigger: '.oe_product_cart a:contains("Customizable Desk")',
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_sale.tour_shop_customize', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register('shop_customize', {
|
||||
test: true,
|
||||
url: '/shop',
|
||||
wait_for: base.ready()
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,13 +2,11 @@ odoo.define('website_sale.tour_shop_deleted_archived_variants', function (requir
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
// This tour relies on a data created from the python test.
|
||||
tour.register('tour_shop_deleted_archived_variants', {
|
||||
test: true,
|
||||
url: '/shop?search=Test Product',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,13 +2,11 @@ odoo.define('website_sale.tour_shop_dynamic_variants', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
// This tour relies on a data created from the python test.
|
||||
tour.register('tour_shop_dynamic_variants', {
|
||||
test: true,
|
||||
url: '/shop?search=Dynamic Product',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,11 +2,9 @@ odoo.define("website_sale.tour_shop_frontend", function (require) {
|
||||
"use strict";
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
var steps = require("website_sale.tour_shop");
|
||||
tour.register("shop", {
|
||||
url: "/shop",
|
||||
wait_for: base.ready(),
|
||||
}, steps);
|
||||
|
||||
});
|
||||
|
||||
@@ -2,13 +2,11 @@ odoo.define('website_sale.tour_shop_no_variant_attribute', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
// This tour relies on a data created from the python test.
|
||||
tour.register('tour_shop_no_variant_attribute', {
|
||||
test: true,
|
||||
url: '/shop?search=Test Product',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,7 +2,6 @@ odoo.define('website_sale.tour_shop_zoom', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require('web_tour.tour');
|
||||
var base = require('web_editor.base');
|
||||
|
||||
var imageSelector = '#o-carousel-product .carousel-item.active img';
|
||||
var imageName = "A Colorful Image";
|
||||
@@ -12,7 +11,6 @@ var nameGreen = "Forest Green";
|
||||
tour.register('shop_zoom', {
|
||||
test: true,
|
||||
url: '/shop?search=' + imageName,
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -2,12 +2,10 @@ odoo.define('website_sale_wishlist.tour', function (require) {
|
||||
'use strict';
|
||||
|
||||
var tour = require("web_tour.tour");
|
||||
var base = require("web_editor.base");
|
||||
|
||||
tour.register('shop_wishlist', {
|
||||
test: true,
|
||||
url: '/shop',
|
||||
wait_for: base.ready(),
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user