From da1899af48902edec7ac6ed8dd5ae2f8b02ec689 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Wed, 13 Feb 2019 16:59:37 +0000 Subject: [PATCH] [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 --- addons/portal/static/src/js/base.js | 28 ------------------- addons/portal/views/assets.xml | 1 - .../static/src/js/sale_tour_sale_signature.js | 2 -- .../website/static/src/js/html_editor.test.js | 3 -- addons/website/static/src/js/tours/banner.js | 4 --- .../website/static/src/js/tours/customize.js | 2 -- .../static/src/js/website.tour.blog.js | 2 -- .../static/src/js/website_crm_tour.js | 2 -- .../static/src/js/website.tour.event.js | 2 -- .../static/src/js/website.tour.event_sale.js | 2 -- .../static/src/js/website_tour_forum.js | 2 -- .../src/js/website_tour_forum_question.js | 2 -- .../src/js/website_hr_recruitment_tour.js | 2 -- .../static/src/js/website_sale_tour_buy.js | 2 -- .../static/src/js/website_sale_tour_shop.js | 2 +- ...e_sale_tour_shop_custom_attribute_value.js | 2 -- .../js/website_sale_tour_shop_customize.js | 2 -- ...ale_tour_shop_deleted_archived_variants.js | 2 -- ...website_sale_tour_shop_dynamic_variants.js | 2 -- .../src/js/website_sale_tour_shop_frontend.js | 2 -- ...ite_sale_tour_shop_no_variant_attribute.js | 2 -- .../src/js/website_sale_tour_shop_zoom.js | 2 -- .../src/js/website_sale_tour_wishlist.js | 2 -- 23 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 addons/portal/static/src/js/base.js diff --git a/addons/portal/static/src/js/base.js b/addons/portal/static/src/js/base.js deleted file mode 100644 index bc5aa9892d0..00000000000 --- a/addons/portal/static/src/js/base.js +++ /dev/null @@ -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()); - }, -}; -}); diff --git a/addons/portal/views/assets.xml b/addons/portal/views/assets.xml index 4eaae9fa361..8ffa1cf5936 100644 --- a/addons/portal/views/assets.xml +++ b/addons/portal/views/assets.xml @@ -17,7 +17,6 @@ - diff --git a/addons/sale/static/src/js/sale_tour_sale_signature.js b/addons/sale/static/src/js/sale_tour_sale_signature.js index b704a561a78..185d445715d 100644 --- a/addons/sale/static/src/js/sale_tour_sale_signature.js +++ b/addons/sale/static/src/js/sale_tour_sale_signature.js @@ -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(), }, [ { diff --git a/addons/website/static/src/js/html_editor.test.js b/addons/website/static/src/js/html_editor.test.js index 99f93eb069a..a7eda78f6ef 100644 --- a/addons/website/static/src/js/html_editor.test.js +++ b/addons/website/static/src/js/html_editor.test.js @@ -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 diff --git a/addons/website/static/src/js/tours/banner.js b/addons/website/static/src/js/tours/banner.js index 1d3951b06c1..5febdf1c749 100644 --- a/addons/website/static/src/js/tours/banner.js +++ b/addons/website/static/src/js/tours/banner.js @@ -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("Click Edit 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("Install a contact form to improve this page."), diff --git a/addons/website/static/src/js/tours/customize.js b/addons/website/static/src/js/tours/customize.js index c1e1f185f2c..5ea83f84ed3 100644 --- a/addons/website/static/src/js/tours/customize.js +++ b/addons/website/static/src/js/tours/customize.js @@ -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.
It will recompute the palette with suggested matching colors."), diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js index a004f360e33..ba0e6049222 100644 --- a/addons/website_blog/static/src/js/website.tour.blog.js +++ b/addons/website_blog/static/src/js/website.tour.blog.js @@ -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."), diff --git a/addons/website_crm/static/src/js/website_crm_tour.js b/addons/website_crm/static/src/js/website_crm_tour.js index 9d72e2a46b3..2923cb1ab50 100644 --- a/addons/website_crm/static/src/js/website_crm_tour.js +++ b/addons/website_crm/static/src/js/website_crm_tour.js @@ -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]", diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js index abaea26c4b8..d84eb8522ee 100644 --- a/addons/website_event/static/src/js/website.tour.event.js +++ b/addons/website_event/static/src/js/website.tour.event.js @@ -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."), diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js index 4686e9595b0..cc47240105c 100644 --- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js +++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js @@ -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() }, [ { diff --git a/addons/website_forum/static/src/js/website_tour_forum.js b/addons/website_forum/static/src/js/website_tour_forum.js index 560de25d451..f93bfa48631 100644 --- a/addons/website_forum/static/src/js/website_tour_forum.js +++ b/addons/website_forum/static/src/js/website_tour_forum.js @@ -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."), diff --git a/addons/website_forum/static/src/js/website_tour_forum_question.js b/addons/website_forum/static/src/js/website_tour_forum_question.js index 57b94a3eb43..93f22a05e1f 100644 --- a/addons/website_forum/static/src/js/website_tour_forum_question.js +++ b/addons/website_forum/static/src/js/website_tour_forum_question.js @@ -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', diff --git a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js index 6b34c373438..19f6852bed6 100644 --- a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js +++ b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js @@ -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]", diff --git a/addons/website_sale/static/src/js/website_sale_tour_buy.js b/addons/website_sale/static/src/js/website_sale_tour_buy.js index 87ae9564b65..34ef819b7e8 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_buy.js +++ b/addons/website_sale/static/src/js/website_sale_tour_buy.js @@ -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() }, [ { diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop.js b/addons/website_sale/static/src/js/website_sale_tour_shop.js index deafdd83369..cdd0c9a9da0 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop.js @@ -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", diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js b/addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js index 0a3b3b19f0c..48d1eb81343 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js @@ -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")', diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_customize.js b/addons/website_sale/static/src/js/website_sale_tour_shop_customize.js index da48b761560..b7a6a32a1c4 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_customize.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_customize.js @@ -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() }, [ { diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js b/addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js index c83b45434c9..5d485b20c13 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js @@ -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(), }, [ { diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js b/addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js index 2007a5e82a1..3afcad271f7 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js @@ -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(), }, [ { diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js b/addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js index f2aa39af42b..b131965117f 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js @@ -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); }); diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js b/addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js index 765fc540ccd..012072d178b 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js @@ -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(), }, [ { diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js b/addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js index 02a327ea53b..3c57436fc5c 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js @@ -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(), }, [ { diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js index 8089d8fb3e7..9357b8118ab 100644 --- a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js +++ b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js @@ -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(), }, [ {