From 51ff8b09dbadf8c0f15a62d2b26e6df6d6630f31 Mon Sep 17 00:00:00 2001 From: Zelong Lin Date: Tue, 24 Aug 2021 12:14:43 +0000 Subject: [PATCH] [REF] *: convert JS files to ES6 modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * = hr, hr_holidays, sms, snailmail, website_livechat, account_invoice_extract, approvals, documents, mail_enterprise, calendar, crm, mrp, note, website_slides, crm_enterprise, sign, social, voip task-2510656 closes odoo/odoo#72712 Related: odoo/enterprise#19241 Signed-off-by: Sébastien Theys (seb) --- .../calendar/static/src/js/base_calendar.js | 11 ++---- .../static/src/js/calendar_controller.js | 17 +++------ .../calendar/static/src/js/calendar_model.js | 8 ++-- .../static/src/js/calendar_renderer.js | 13 +++---- .../calendar/static/src/js/calendar_view.js | 19 +++++----- .../static/src/js/systray_activity_menu.js | 9 ++--- .../calendar/static/tests/calendar_tests.js | 8 ++-- .../tests/systray_activity_menu_tests.js | 11 ++---- addons/crm/static/src/js/crm_form.js | 12 +++--- addons/crm/static/src/js/crm_kanban.js | 13 +++---- .../static/src/js/systray_activity_menu.js | 6 +-- addons/crm/static/src/js/tours/crm.js | 13 ++----- .../crm/static/tests/crm_rainbowman_tests.js | 4 +- addons/crm/static/tests/mock_server.js | 6 +-- .../crm/static/tests/tours/crm_rainbowman.js | 6 +-- .../src/js/leads_tree_generate_leads.js | 2 +- .../static/src/js/tours/crm_iap_lead.js | 2 +- .../static/src/js/google_calendar.js | 8 ++-- .../static/src/js/google_calendar_popover.js | 2 +- .../static/tests/google_calendar_tests.js | 2 +- addons/hr/static/src/js/language.js | 12 +++--- .../src/js/standalone_m2o_avatar_employee.js | 12 +++--- .../hr/static/src/models/employee/employee.js | 11 ++---- .../static/src/models/messaging/messaging.js | 9 ++--- .../hr/static/src/models/partner/partner.js | 11 ++---- addons/hr/static/src/models/user/user.js | 10 ++--- addons/hr/static/tests/helpers/mock_models.js | 9 ++--- .../static/tests/m2x_avatar_employee_tests.js | 18 ++++----- .../standalone_m2o_avatar_employee_tests.js | 16 ++++---- .../partner_im_status_icon_tests.js | 9 ++--- .../thread_icon/thread_icon_tests.js | 9 ++--- .../thread_view/thread_view_tests.js | 11 ++---- .../static/src/js/microsoft_calendar.js | 8 ++-- .../src/js/microsoft_calendar_popover.js | 2 +- addons/mrp/static/src/js/mrp.js | 20 ++++------ addons/mrp/static/src/js/mrp_bom_report.js | 13 +++---- .../static/src/js/mrp_document_kanban_view.js | 15 +++----- .../src/js/mrp_documents_controller_mixin.js | 13 +++---- .../src/js/mrp_documents_document_viewer.js | 10 ++--- .../src/js/mrp_documents_kanban_controller.js | 11 ++---- .../src/js/mrp_documents_kanban_record.js | 9 ++--- .../src/js/mrp_documents_kanban_renderer.js | 11 ++---- .../src/js/mrp_field_one2many_with_copy.js | 17 +++------ .../mrp/static/src/js/mrp_should_consume.js | 15 +++----- .../static/src/js/mrp_workorder_popover.js | 13 +++---- .../static/tests/mrp_document_kanban_tests.js | 11 ++---- addons/mrp/static/tests/mrp_tests.js | 8 ++-- .../static/src/js/systray_activity_menu.js | 12 ++---- .../tests/systray_activity_menu_tests.js | 11 ++---- .../src/components/message/message_tests.js | 15 +++----- .../notification_group/notification_group.js | 13 ++----- addons/sms/static/src/js/fields_sms_widget.js | 14 +++---- .../sms/static/src/models/message/message.js | 9 ++--- .../notification_group/notification_group.js | 9 ++--- addons/sms/static/tests/sms_widget_test.js | 11 ++---- .../static/src/components/message/message.js | 9 ++--- .../src/components/message/message_tests.js | 13 +++---- .../notification_group/notification_group.js | 13 ++----- ...ification_list_notification_group_tests.js | 11 ++---- .../snailmail_error_dialog.js | 11 ++---- .../snailmail_notification_popover.js | 9 ++--- .../static/src/models/message/message.js | 7 +--- .../static/src/models/messaging/messaging.js | 11 ++---- .../notification_group/notification_group.js | 9 ++--- .../static/tests/helpers/mock_server.js | 7 +--- .../src/components/discuss/discuss_tests.js | 9 ++--- .../visitor_banner/visitor_banner.js | 9 ++--- .../static/src/js/website_livechat.editor.js | 13 ++----- .../static/src/legacy/public_livechat.js | 2 +- .../messaging_notification_handler.js | 7 +--- .../messaging_notification_handler_tests.js | 19 +++------- .../static/src/models/thread/thread.js | 13 +++---- .../static/src/models/visitor/visitor.js | 11 ++---- .../static/tests/helpers/mock_models.js | 9 ++--- .../static/tests/helpers/mock_server.js | 9 ++--- .../static/src/js/slides_course_join.js | 2 +- .../static/src/js/slides_course_quiz.js | 2 +- .../src/js/slides_course_unsubscribe.js | 2 +- .../src/components/activity/activity.js | 13 ++----- .../static/src/js/portal_chatter.js | 9 ++--- .../static/src/js/rating_field_backend.js | 15 +++----- .../static/src/js/slide_category_one2many.js | 14 +++---- addons/website_slides/static/src/js/slides.js | 19 ++-------- .../static/src/js/slides_category_add.js | 14 +++---- .../static/src/js/slides_category_delete.js | 14 +++---- .../src/js/slides_course_enroll_email.js | 14 +++---- .../src/js/slides_course_fullscreen_player.js | 30 ++++++--------- .../static/src/js/slides_course_join.js | 11 ++---- .../static/src/js/slides_course_quiz.js | 37 ++++++++----------- .../src/js/slides_course_quiz_finish.js | 12 ++---- .../js/slides_course_quiz_question_form.js | 10 ++--- .../src/js/slides_course_slides_list.js | 12 ++---- .../static/src/js/slides_course_tag_add.js | 15 +++----- .../src/js/slides_course_unsubscribe.js | 15 +++----- .../static/src/js/slides_share.js | 11 ++---- .../static/src/js/slides_slide_archive.js | 14 +++---- .../static/src/js/slides_slide_like.js | 15 +++----- .../src/js/slides_slide_toggle_is_preview.js | 9 ++--- .../static/src/js/slides_upload.js | 18 +++------ .../static/src/js/website_slides.editor.js | 17 +++------ .../src/tests/tours/slides_course_member.js | 7 +--- .../tests/tours/slides_course_member_yt.js | 9 ++--- .../tests/tours/slides_course_publisher.js | 9 ++--- .../tours/slides_full_screen_web_editor.js | 7 +--- .../src/tests/tours/slides_tour_tools.js | 7 +--- .../src/js/slides_course_fullscreen_player.js | 2 +- .../static/src/js/slides_upload.js | 2 +- 107 files changed, 423 insertions(+), 744 deletions(-) diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js index 29220944a06..d5615ab95b8 100644 --- a/addons/calendar/static/src/js/base_calendar.js +++ b/addons/calendar/static/src/js/base_calendar.js @@ -1,9 +1,8 @@ -odoo.define('base_calendar.base_calendar', function (require) { -"use strict"; +/** @odoo-module **/ -var BasicModel = require('web.BasicModel'); -var fieldRegistry = require('web.field_registry'); -var relationalFields = require('web.relational_fields'); +import BasicModel from 'web.BasicModel'; +import fieldRegistry from 'web.field_registry'; +import relationalFields from 'web.relational_fields'; const FieldMany2ManyTagsAvatar = relationalFields.FieldMany2ManyTagsAvatar; @@ -52,5 +51,3 @@ const Many2ManyAttendee = FieldMany2ManyTagsAvatar.extend({ }); fieldRegistry.add('many2manyattendee', Many2ManyAttendee); - -}); diff --git a/addons/calendar/static/src/js/calendar_controller.js b/addons/calendar/static/src/js/calendar_controller.js index afb48c1fbaf..74f9f019b8d 100644 --- a/addons/calendar/static/src/js/calendar_controller.js +++ b/addons/calendar/static/src/js/calendar_controller.js @@ -1,11 +1,8 @@ -odoo.define('calendar.CalendarController', function (require) { - "use strict"; +/** @odoo-module **/ - const Controller = require('web.CalendarController'); - const Dialog = require('web.Dialog'); - const { qweb, _t } = require('web.core'); - const core = require('web.core'); - const QWeb = core.qweb; + import Controller from 'web.CalendarController'; + import Dialog from 'web.Dialog'; + import { qweb as QWeb, _t } from 'web.core'; const CalendarController = Controller.extend({ @@ -27,7 +24,7 @@ odoo.define('calendar.CalendarController', function (require) { new Dialog(this, { title: _t('Edit Recurrent event'), size: 'small', - $content: $(qweb.render('calendar.RecurrentEventUpdate')), + $content: $(QWeb.render('calendar.RecurrentEventUpdate')), buttons: [{ text: _t('Confirm'), classes: 'btn-primary', @@ -89,6 +86,4 @@ odoo.define('calendar.CalendarController', function (require) { }); - return CalendarController; - -}); + export default CalendarController; diff --git a/addons/calendar/static/src/js/calendar_model.js b/addons/calendar/static/src/js/calendar_model.js index 81d529e9bb9..7c83add08c6 100644 --- a/addons/calendar/static/src/js/calendar_model.js +++ b/addons/calendar/static/src/js/calendar_model.js @@ -1,7 +1,6 @@ -odoo.define('calendar.CalendarModel', function (require) { - "use strict"; +/** @odoo-module **/ - const Model = require('web.CalendarModel'); + import Model from 'web.CalendarModel'; const CalendarModel = Model.extend({ @@ -78,5 +77,4 @@ odoo.define('calendar.CalendarModel', function (require) { }, }); - return CalendarModel; -}); + export default CalendarModel; diff --git a/addons/calendar/static/src/js/calendar_renderer.js b/addons/calendar/static/src/js/calendar_renderer.js index 3ccd924ea7b..f606bf36cec 100644 --- a/addons/calendar/static/src/js/calendar_renderer.js +++ b/addons/calendar/static/src/js/calendar_renderer.js @@ -1,9 +1,8 @@ -odoo.define('calendar.CalendarRenderer', function (require) { -"use strict"; +/** @odoo-module **/ -const CalendarRenderer = require('web.CalendarRenderer'); -const CalendarPopover = require('web.CalendarPopover'); -const session = require('web.session'); +import CalendarRenderer from 'web.CalendarRenderer'; +import CalendarPopover from 'web.CalendarPopover'; +import session from 'web.session'; const AttendeeCalendarPopover = CalendarPopover.extend({ template: 'Calendar.attendee.status.popover', @@ -132,9 +131,7 @@ const AttendeeCalendarRenderer = CalendarRenderer.extend({ }, }); -return { +export default { AttendeeCalendarRenderer: AttendeeCalendarRenderer, AttendeeCalendarPopover: AttendeeCalendarPopover, }; - -}); diff --git a/addons/calendar/static/src/js/calendar_view.js b/addons/calendar/static/src/js/calendar_view.js index 78eb7ec2752..85569e9c5ab 100644 --- a/addons/calendar/static/src/js/calendar_view.js +++ b/addons/calendar/static/src/js/calendar_view.js @@ -1,11 +1,12 @@ -odoo.define('calendar.CalendarView', function (require) { -"use strict"; +/** @odoo-module **/ -var CalendarController = require('calendar.CalendarController'); -var CalendarModel = require('calendar.CalendarModel'); -const CalendarRenderer = require('calendar.CalendarRenderer').AttendeeCalendarRenderer; -var CalendarView = require('web.CalendarView'); -var viewRegistry = require('web.view_registry'); +import CalendarController from '@calendar/js/calendar_controller'; +import CalendarModel from '@calendar/js/calendar_model'; +import AttendeeCalendarRenderer from '@calendar/js/calendar_renderer'; +import CalendarView from 'web.CalendarView'; +import viewRegistry from 'web.view_registry'; + +const CalendarRenderer = AttendeeCalendarRenderer.AttendeeCalendarRenderer; var AttendeeCalendarView = CalendarView.extend({ config: _.extend({}, CalendarView.prototype.config, { @@ -17,6 +18,4 @@ var AttendeeCalendarView = CalendarView.extend({ viewRegistry.add('attendee_calendar', AttendeeCalendarView); -return AttendeeCalendarView - -}); +export default AttendeeCalendarView; diff --git a/addons/calendar/static/src/js/systray_activity_menu.js b/addons/calendar/static/src/js/systray_activity_menu.js index 22d0a1dde29..28d1986fbb9 100644 --- a/addons/calendar/static/src/js/systray_activity_menu.js +++ b/addons/calendar/static/src/js/systray_activity_menu.js @@ -1,8 +1,7 @@ -odoo.define('calendar.systray.ActivityMenu', function (require) { -"use strict"; +/** @odoo-module **/ -var ActivityMenu = require('@mail/js/systray/systray_activity_menu')[Symbol.for("default")]; -var fieldUtils = require('web.field_utils'); +import ActivityMenu from '@mail/js/systray/systray_activity_menu'; +import fieldUtils from 'web.field_utils'; ActivityMenu.include({ @@ -52,5 +51,3 @@ ActivityMenu.include({ } }, }); - -}); diff --git a/addons/calendar/static/tests/calendar_tests.js b/addons/calendar/static/tests/calendar_tests.js index 1e6f5ddd8f1..74cda12450b 100644 --- a/addons/calendar/static/tests/calendar_tests.js +++ b/addons/calendar/static/tests/calendar_tests.js @@ -1,8 +1,7 @@ -odoo.define('calendar.tests', function (require) { -"use strict"; +/** @odoo-module **/ -var FormView = require('web.FormView'); -var testUtils = require("web.test_utils"); +import FormView from 'web.FormView'; +import testUtils from "web.test_utils"; var createView = testUtils.createView; @@ -85,4 +84,3 @@ QUnit.module('calendar', { form.destroy(); }); }); -}); diff --git a/addons/calendar/static/tests/systray_activity_menu_tests.js b/addons/calendar/static/tests/systray_activity_menu_tests.js index 56d7ce56caf..65f0337b996 100644 --- a/addons/calendar/static/tests/systray_activity_menu_tests.js +++ b/addons/calendar/static/tests/systray_activity_menu_tests.js @@ -1,10 +1,9 @@ -odoo.define('calendar.systray.ActivityMenuTests', function (require) { -"use strict"; +/** @odoo-module **/ -const { afterEach, beforeEach, start } = require('@mail/utils/test_utils'); -var ActivityMenu = require('@mail/js/systray/systray_activity_menu')[Symbol.for("default")]; +import { afterEach, beforeEach, start } from '@mail/utils/test_utils'; +import ActivityMenu from '@mail/js/systray/systray_activity_menu'; -var testUtils = require('web.test_utils'); +import testUtils from 'web.test_utils'; QUnit.module('calendar', {}, function () { QUnit.module('ActivityMenu', { @@ -78,5 +77,3 @@ QUnit.test('activity menu widget:today meetings', async function (assert) { widget.destroy(); }); }); - -}); diff --git a/addons/crm/static/src/js/crm_form.js b/addons/crm/static/src/js/crm_form.js index 40845647edf..57f3eef9b03 100644 --- a/addons/crm/static/src/js/crm_form.js +++ b/addons/crm/static/src/js/crm_form.js @@ -1,5 +1,4 @@ -odoo.define("crm.crm_form", function (require) { - "use strict"; +/** @odoo-module **/ /** * This From Controller makes sure we display a rainbowman message @@ -9,9 +8,9 @@ odoo.define("crm.crm_form", function (require) { * with a rainbowman like when the user click on the button "Mark Won". */ - var FormController = require('web.FormController'); - var FormView = require('web.FormView'); - var viewRegistry = require('web.view_registry'); + import FormController from 'web.FormController'; + import FormView from 'web.FormView'; + import viewRegistry from 'web.view_registry'; var CrmFormController = FormController.extend({ /** @@ -84,8 +83,7 @@ odoo.define("crm.crm_form", function (require) { viewRegistry.add('crm_form', CrmFormView); - return { + export default { CrmFormController: CrmFormController, CrmFormView: CrmFormView, }; -}); diff --git a/addons/crm/static/src/js/crm_kanban.js b/addons/crm/static/src/js/crm_kanban.js index dbc50064c7a..af147b7a794 100644 --- a/addons/crm/static/src/js/crm_kanban.js +++ b/addons/crm/static/src/js/crm_kanban.js @@ -1,5 +1,4 @@ -odoo.define('crm.crm_kanban', function (require) { - "use strict"; +/** @odoo-module **/ /** * This Kanban Model make sure we display a rainbowman @@ -7,9 +6,9 @@ odoo.define('crm.crm_kanban', function (require) { * correct column and when it's grouped by stage_id (default). */ - var KanbanModel = require('web.KanbanModel'); - var KanbanView = require('web.KanbanView'); - var viewRegistry = require('web.view_registry'); + import KanbanModel from 'web.KanbanModel'; + import KanbanView from 'web.KanbanView'; + import viewRegistry from 'web.view_registry'; var CrmKanbanModel = KanbanModel.extend({ /** @@ -44,9 +43,7 @@ odoo.define('crm.crm_kanban', function (require) { viewRegistry.add('crm_kanban', CrmKanbanView); - return { + export default { CrmKanbanModel: CrmKanbanModel, CrmKanbanView: CrmKanbanView, }; - -}); diff --git a/addons/crm/static/src/js/systray_activity_menu.js b/addons/crm/static/src/js/systray_activity_menu.js index 71738916e7d..8893ab7d8af 100644 --- a/addons/crm/static/src/js/systray_activity_menu.js +++ b/addons/crm/static/src/js/systray_activity_menu.js @@ -1,7 +1,6 @@ -odoo.define('crm.systray.ActivityMenu', function (require) { -"use strict"; +/** @odoo-module **/ -var ActivityMenu = require('@mail/js/systray/systray_activity_menu')[Symbol.for("default")]; +import ActivityMenu from '@mail/js/systray/systray_activity_menu'; ActivityMenu.include({ @@ -54,4 +53,3 @@ ActivityMenu.include({ } }, }); -}); diff --git a/addons/crm/static/src/js/tours/crm.js b/addons/crm/static/src/js/tours/crm.js index 12893ba0f15..30429eea3fa 100644 --- a/addons/crm/static/src/js/tours/crm.js +++ b/addons/crm/static/src/js/tours/crm.js @@ -1,11 +1,8 @@ -odoo.define('crm.tour', function(require) { -"use strict"; +/** @odoo-module **/ -var core = require('web.core'); -const {Markup} = require('web.utils'); -var tour = require('web_tour.tour'); - -var _t = core._t; +import { _t } from 'web.core'; +import { Markup } from 'web.utils'; +import tour from 'web_tour.tour'; tour.register('crm_tour', { url: "/web", @@ -91,5 +88,3 @@ tour.register('crm_tour', { actions.auto(".breadcrumb-item:not(.active):last"); } }]); - -}); diff --git a/addons/crm/static/tests/crm_rainbowman_tests.js b/addons/crm/static/tests/crm_rainbowman_tests.js index 3a0158d15db..79fbcf9c70c 100644 --- a/addons/crm/static/tests/crm_rainbowman_tests.js +++ b/addons/crm/static/tests/crm_rainbowman_tests.js @@ -1,8 +1,8 @@ odoo.define('crm.form_rainbowman_tests', function (require) { "use strict"; - var CrmFormView = require('crm.crm_form').CrmFormView; - var CrmKanbanView = require('crm.crm_kanban').CrmKanbanView; + var CrmFormView = require('@crm/js/crm_form')[Symbol.for("default")].CrmFormView; + var CrmKanbanView = require('@crm/js/crm_kanban')[Symbol.for("default")].CrmKanbanView; var testUtils = require('web.test_utils'); var createView = testUtils.createView; diff --git a/addons/crm/static/tests/mock_server.js b/addons/crm/static/tests/mock_server.js index 0c6c0fbb64e..8dabd544ab0 100644 --- a/addons/crm/static/tests/mock_server.js +++ b/addons/crm/static/tests/mock_server.js @@ -1,7 +1,6 @@ -odoo.define('crm.MockServer', function (require) { - 'use strict'; +/** @odoo-module **/ - var MockServer = require('web.MockServer'); + import MockServer from 'web.MockServer'; MockServer.include({ //-------------------------------------------------------------------------- @@ -53,4 +52,3 @@ odoo.define('crm.MockServer', function (require) { return this._super(...arguments); }, }); -}); diff --git a/addons/crm/static/tests/tours/crm_rainbowman.js b/addons/crm/static/tests/tours/crm_rainbowman.js index 3cfed895780..5e55fdcdc92 100644 --- a/addons/crm/static/tests/tours/crm_rainbowman.js +++ b/addons/crm/static/tests/tours/crm_rainbowman.js @@ -1,7 +1,6 @@ -odoo.define('crm.tour_crm_rainbowman', function (require) { - "use strict"; +/** @odoo-module **/ - var tour = require('web_tour.tour'); + import tour from 'web_tour.tour'; tour.register('crm_rainbowman', { test: true, @@ -74,4 +73,3 @@ odoo.define('crm.tour_crm_rainbowman', function (require) { content: "last rainbowman appears", } ]); -}); diff --git a/addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js b/addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js index 7db2d99e1ab..9109be9256c 100644 --- a/addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js +++ b/addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js @@ -4,7 +4,7 @@ odoo.define('crm.leads.tree', function (require) { var ListView = require('web.ListView'); var KanbanController = require('web.KanbanController'); - var KanbanView = require('crm.crm_kanban').CrmKanbanView; + var KanbanView = require('@crm/js/crm_kanban')[Symbol.for("default")].CrmKanbanView; var viewRegistry = require('web.view_registry'); diff --git a/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js b/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js index 8d9b913645b..10a49b2fb12 100644 --- a/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js +++ b/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js @@ -5,7 +5,7 @@ var tour = require('web_tour.tour'); const {Markup} = require('web.utils'); var core = require('web.core'); -require('crm.tour'); +require('@crm/js/tours/crm'); var _t = core._t; var DragOppToWonStepIndex = _.findIndex(tour.tours.crm_tour.steps, function (step) { diff --git a/addons/google_calendar/static/src/js/google_calendar.js b/addons/google_calendar/static/src/js/google_calendar.js index 167917d51b0..d1af0fa145d 100644 --- a/addons/google_calendar/static/src/js/google_calendar.js +++ b/addons/google_calendar/static/src/js/google_calendar.js @@ -4,10 +4,10 @@ odoo.define('google_calendar.CalendarView', function (require) { var core = require('web.core'); var Dialog = require('web.Dialog'); var framework = require('web.framework'); -const CalendarView = require('calendar.CalendarView'); -const CalendarRenderer = require('calendar.CalendarRenderer').AttendeeCalendarRenderer; -const CalendarController = require('calendar.CalendarController'); -const CalendarModel = require('calendar.CalendarModel'); +const CalendarView = require('@calendar/js/calendar_view')[Symbol.for("default")]; +const CalendarRenderer = require('@calendar/js/calendar_renderer')[Symbol.for("default")].AttendeeCalendarRenderer; +const CalendarController = require('@calendar/js/calendar_controller')[Symbol.for("default")]; +const CalendarModel = require('@calendar/js/calendar_model')[Symbol.for("default")]; const viewRegistry = require('web.view_registry'); const session = require('web.session'); diff --git a/addons/google_calendar/static/src/js/google_calendar_popover.js b/addons/google_calendar/static/src/js/google_calendar_popover.js index 497cc09d086..42d3b9e6a6f 100644 --- a/addons/google_calendar/static/src/js/google_calendar_popover.js +++ b/addons/google_calendar/static/src/js/google_calendar_popover.js @@ -1,7 +1,7 @@ odoo.define('google_calendar.GoogleCalendarPopover', function(require) { "use strict"; - const CalendarPopover = require('calendar.CalendarRenderer').AttendeeCalendarPopover; + const CalendarPopover = require('@calendar/js/calendar_renderer')[Symbol.for("default")].AttendeeCalendarPopover; const GoogleCalendarPopover = CalendarPopover.include({ events: _.extend({}, CalendarPopover.prototype.events, { diff --git a/addons/google_calendar/static/tests/google_calendar_tests.js b/addons/google_calendar/static/tests/google_calendar_tests.js index 7129fda6a42..eb4723f01b4 100644 --- a/addons/google_calendar/static/tests/google_calendar_tests.js +++ b/addons/google_calendar/static/tests/google_calendar_tests.js @@ -1,7 +1,7 @@ odoo.define('google_calendar.calendar_tests', function (require) { "use strict"; -var GoogleCalendarView = require('calendar.CalendarView'); +var GoogleCalendarView = require('@calendar/js/calendar_view')[Symbol.for("default")]; var testUtils = require('web.test_utils'); var createCalendarView = testUtils.createCalendarView; diff --git a/addons/hr/static/src/js/language.js b/addons/hr/static/src/js/language.js index 35140c7f28f..17346f9cd90 100644 --- a/addons/hr/static/src/js/language.js +++ b/addons/hr/static/src/js/language.js @@ -1,9 +1,8 @@ -odoo.define('hr.employee_language', function (require) { -'use strict'; +/** @odoo-module **/ -var FormController = require('web.FormController'); -var FormView = require('web.FormView'); -var viewRegistry = require('web.view_registry'); +import FormController from 'web.FormController'; +import FormView from 'web.FormView'; +import viewRegistry from 'web.view_registry'; var EmployeeFormController = FormController.extend({ saveRecord: function () { @@ -23,5 +22,4 @@ var EmployeeProfileFormView = FormView.extend({ }); viewRegistry.add('hr_employee_profile_form', EmployeeProfileFormView); -return EmployeeProfileFormView; -}); +export default EmployeeProfileFormView; diff --git a/addons/hr/static/src/js/standalone_m2o_avatar_employee.js b/addons/hr/static/src/js/standalone_m2o_avatar_employee.js index 64da43ecbb9..794d38cc060 100644 --- a/addons/hr/static/src/js/standalone_m2o_avatar_employee.js +++ b/addons/hr/static/src/js/standalone_m2o_avatar_employee.js @@ -1,10 +1,9 @@ -odoo.define('hr.StandaloneM2OAvatarEmployee', function (require) { - 'use strict'; +/** @odoo-module **/ - const StandaloneFieldManagerMixin = require('web.StandaloneFieldManagerMixin'); - const Widget = require('web.Widget'); + import StandaloneFieldManagerMixin from 'web.StandaloneFieldManagerMixin'; + import Widget from 'web.Widget'; - const { Many2OneAvatarEmployee } = require('hr.Many2OneAvatarEmployee'); + import { Many2OneAvatarEmployee } from '@hr/js/m2x_avatar_employee'; const StandaloneM2OAvatarEmployee = Widget.extend(StandaloneFieldManagerMixin, { className: 'o_standalone_avatar_employee', @@ -57,5 +56,4 @@ odoo.define('hr.StandaloneM2OAvatarEmployee', function (require) { }, }); - return StandaloneM2OAvatarEmployee; -}); + export default StandaloneM2OAvatarEmployee; diff --git a/addons/hr/static/src/models/employee/employee.js b/addons/hr/static/src/models/employee/employee.js index d321dcca075..ec2258c1c81 100644 --- a/addons/hr/static/src/models/employee/employee.js +++ b/addons/hr/static/src/models/employee/employee.js @@ -1,9 +1,8 @@ -odoo.define('hr/static/src/models/employee/employee.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerNewModel } = require('@mail/model/model_core'); -const { attr, one2one } = require('@mail/model/model_field'); -const { insert, unlink } = require('@mail/model/model_field_command'); +import { registerNewModel } from '@mail/model/model_core'; +import { attr, one2one } from '@mail/model/model_field'; +import { insert, unlink } from '@mail/model/model_field_command'; function factory(dependencies) { @@ -203,5 +202,3 @@ function factory(dependencies) { } registerNewModel('hr.employee', factory); - -}); diff --git a/addons/hr/static/src/models/messaging/messaging.js b/addons/hr/static/src/models/messaging/messaging.js index 20823147a37..880915836da 100644 --- a/addons/hr/static/src/models/messaging/messaging.js +++ b/addons/hr/static/src/models/messaging/messaging.js @@ -1,9 +1,8 @@ -odoo.define('hr/static/src/models/messaging/messaging.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, -} = require('@mail/model/model_core'); +} from '@mail/model/model_core'; registerInstancePatchModel('mail.messaging', 'hr/static/src/models/messaging/messaging.js', { //-------------------------------------------------------------------------- @@ -32,5 +31,3 @@ registerInstancePatchModel('mail.messaging', 'hr/static/src/models/messaging/mes return this._super(...arguments); }, }); - -}); diff --git a/addons/hr/static/src/models/partner/partner.js b/addons/hr/static/src/models/partner/partner.js index 4d337e62892..2f40309b967 100644 --- a/addons/hr/static/src/models/partner/partner.js +++ b/addons/hr/static/src/models/partner/partner.js @@ -1,11 +1,10 @@ -odoo.define('hr/static/src/models/partner/partner.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, registerFieldPatchModel, -} = require('@mail/model/model_core'); -const { attr, one2one } = require('@mail/model/model_field'); +} from '@mail/model/model_core'; +import { attr, one2one } from '@mail/model/model_field'; registerInstancePatchModel('mail.partner', 'hr/static/src/models/partner/partner.js', { //-------------------------------------------------------------------------- @@ -59,5 +58,3 @@ registerFieldPatchModel('mail.partner', 'hr/static/src/models/partner/partner.js default: false, }), }); - -}); diff --git a/addons/hr/static/src/models/user/user.js b/addons/hr/static/src/models/user/user.js index 326ad3004a7..a96e011810b 100644 --- a/addons/hr/static/src/models/user/user.js +++ b/addons/hr/static/src/models/user/user.js @@ -1,10 +1,9 @@ -odoo.define('hr/static/src/models/user/user.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerFieldPatchModel, -} = require('@mail/model/model_core'); -const { one2one } = require('@mail/model/model_field'); +} from '@mail/model/model_core'; +import { one2one } from '@mail/model/model_field'; registerFieldPatchModel('mail.user', 'hr/static/src/models/user/user.js', { /** @@ -15,4 +14,3 @@ registerFieldPatchModel('mail.user', 'hr/static/src/models/user/user.js', { }), }); -}); diff --git a/addons/hr/static/tests/helpers/mock_models.js b/addons/hr/static/tests/helpers/mock_models.js index 3a3d490b9ae..520425ee74c 100644 --- a/addons/hr/static/tests/helpers/mock_models.js +++ b/addons/hr/static/tests/helpers/mock_models.js @@ -1,8 +1,7 @@ -odoo.define('hr/static/tests/helpers/mock_models.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { MockModels } = require('@mail/../tests/helpers/mock_models'); -const { patch } = require('web.utils'); +import { MockModels } from '@mail/../tests/helpers/mock_models'; +import { patch } from 'web.utils'; patch(MockModels, 'hr/static/tests/helpers/mock_models.js', { @@ -29,5 +28,3 @@ patch(MockModels, 'hr/static/tests/helpers/mock_models.js', { }, }); - -}); diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js index db7baf0cf00..46af4662854 100644 --- a/addons/hr/static/tests/m2x_avatar_employee_tests.js +++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js @@ -1,18 +1,17 @@ -odoo.define('hr.M2XAvatarEmployeeTests', function (require) { -"use strict"; +/** @odoo-module **/ -const { +import { afterEach, afterNextRender, beforeEach, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; -const FormView = require('web.FormView'); -const KanbanView = require('web.KanbanView'); -const ListView = require('web.ListView'); -const { Many2OneAvatarEmployee } = require('hr.Many2OneAvatarEmployee'); -const { dom, mock } = require('web.test_utils'); +import FormView from 'web.FormView'; +import KanbanView from 'web.KanbanView'; +import ListView from 'web.ListView'; +import { Many2OneAvatarEmployee } from '@hr/js/m2x_avatar_employee'; +import { dom, mock } from 'web.test_utils'; QUnit.module('hr', {}, function () { QUnit.module('M2XAvatarEmployee', { @@ -442,4 +441,3 @@ QUnit.module('hr', {}, function () { form.destroy(); }); }); -}); diff --git a/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js b/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js index 976cd34da50..f5cf02405ec 100644 --- a/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js +++ b/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js @@ -1,15 +1,14 @@ -odoo.define('hr.StandaloneM2OEmployeeTests', function (require) { - "use strict"; +/** @odoo-module **/ const { xml } = owl.tags; - const AbstractRendererOwl = require('web.AbstractRendererOwl'); - const BasicView = require("web.BasicView"); - const BasicRenderer = require("web.BasicRenderer"); - const RendererWrapper = require('web.RendererWrapper'); - const { createView } = require('web.test_utils'); + import AbstractRendererOwl from 'web.AbstractRendererOwl'; + import BasicView from "web.BasicView"; + import BasicRenderer from "web.BasicRenderer"; + import RendererWrapper from 'web.RendererWrapper'; + import { createView } from 'web.test_utils'; - const StandaloneM2OAvatarEmployee = require('hr.StandaloneM2OAvatarEmployee'); + import StandaloneM2OAvatarEmployee from '@hr/js/standalone_m2o_avatar_employee'; function getHtmlRenderer(html) { return BasicRenderer.extend({ @@ -121,4 +120,3 @@ odoo.define('hr.StandaloneM2OEmployeeTests', function (require) { view.destroy(); }); }); -}); diff --git a/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js b/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js index eb145199935..6cb89b99489 100644 --- a/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js +++ b/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js @@ -1,12 +1,11 @@ -odoo.define('hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { afterEach, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; QUnit.module('hr_holidays', {}, function () { QUnit.module('components', {}, function () { @@ -104,5 +103,3 @@ QUnit.test('on leave & offline', async function (assert) { }); }); }); - -}); diff --git a/addons/hr_holidays/static/src/components/thread_icon/thread_icon_tests.js b/addons/hr_holidays/static/src/components/thread_icon/thread_icon_tests.js index 8b318c13a41..b9253de72c8 100644 --- a/addons/hr_holidays/static/src/components/thread_icon/thread_icon_tests.js +++ b/addons/hr_holidays/static/src/components/thread_icon/thread_icon_tests.js @@ -1,12 +1,11 @@ -odoo.define('hr_holidays/static/src/components/thread_icon/thread_icon_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { afterEach, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; QUnit.module('mail', {}, function () { QUnit.module('components', {}, function () { @@ -135,5 +134,3 @@ QUnit.test('thread icon of a chat when correspondent is on leave & offline', asy }); }); }); - -}); diff --git a/addons/hr_holidays/static/src/components/thread_view/thread_view_tests.js b/addons/hr_holidays/static/src/components/thread_view/thread_view_tests.js index 56cdcd752ba..02bd0756bc4 100644 --- a/addons/hr_holidays/static/src/components/thread_view/thread_view_tests.js +++ b/addons/hr_holidays/static/src/components/thread_view/thread_view_tests.js @@ -1,13 +1,12 @@ -odoo.define('hr_holidays/static/src/components/thread_view/thread_view_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { link } = require('@mail/model/model_field_command'); -const { +import { link } from '@mail/model/model_field_command'; +import { afterEach, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; QUnit.module('hr_holidays', {}, function () { QUnit.module('components', {}, function () { @@ -84,5 +83,3 @@ QUnit.test('out of office message on direct chat with out of office partner', as }); }); }); - -}); diff --git a/addons/microsoft_calendar/static/src/js/microsoft_calendar.js b/addons/microsoft_calendar/static/src/js/microsoft_calendar.js index 28acaafe6be..6623bc712a5 100644 --- a/addons/microsoft_calendar/static/src/js/microsoft_calendar.js +++ b/addons/microsoft_calendar/static/src/js/microsoft_calendar.js @@ -4,10 +4,10 @@ odoo.define('microsoft_calendar.CalendarView', function (require) { var core = require('web.core'); var Dialog = require('web.Dialog'); var framework = require('web.framework'); -const CalendarView = require('calendar.CalendarView'); -const CalendarRenderer = require('calendar.CalendarRenderer').AttendeeCalendarRenderer; -const CalendarController = require('calendar.CalendarController'); -const CalendarModel = require('calendar.CalendarModel'); +const CalendarView = require('@calendar/js/calendar_view')[Symbol.for("default")]; +const CalendarRenderer = require('@calendar/js/calendar_renderer')[Symbol.for("default")].AttendeeCalendarRenderer; +const CalendarController = require('@calendar/js/calendar_controller')[Symbol.for("default")]; +const CalendarModel = require('@calendar/js/calendar_model')[Symbol.for("default")]; const viewRegistry = require('web.view_registry'); const session = require('web.session'); diff --git a/addons/microsoft_calendar/static/src/js/microsoft_calendar_popover.js b/addons/microsoft_calendar/static/src/js/microsoft_calendar_popover.js index e80e525d765..48c625fe9df 100644 --- a/addons/microsoft_calendar/static/src/js/microsoft_calendar_popover.js +++ b/addons/microsoft_calendar/static/src/js/microsoft_calendar_popover.js @@ -1,7 +1,7 @@ odoo.define('microsoft_calendar.MicrosoftCalendarPopover', function(require) { "use strict"; - const CalendarPopover = require('calendar.CalendarRenderer').AttendeeCalendarPopover; + const CalendarPopover = require('@calendar/js/calendar_renderer')[Symbol.for("default")].AttendeeCalendarPopover; const MicrosoftCalendarPopover = CalendarPopover.include({ events: _.extend({}, CalendarPopover.prototype.events, { diff --git a/addons/mrp/static/src/js/mrp.js b/addons/mrp/static/src/js/mrp.js index f895aef9112..1be65f5010d 100644 --- a/addons/mrp/static/src/js/mrp.js +++ b/addons/mrp/static/src/js/mrp.js @@ -1,14 +1,11 @@ -odoo.define('mrp.mrp_state', function (require) { -"use strict"; +/** @odoo-module **/ -var AbstractField = require('web.AbstractField'); -var core = require('web.core'); -var fields = require('web.basic_fields'); -var fieldUtils = require('web.field_utils'); -var field_registry = require('web.field_registry'); -var time = require('web.time'); - -var _t = core._t; +import AbstractField from 'web.AbstractField'; +import { _t } from 'web.core'; +import fields from 'web.basic_fields'; +import fieldUtils from 'web.field_utils'; +import field_registry from 'web.field_registry'; +import time from 'web.time'; /** * This widget is used to display the availability on a workorder. @@ -264,5 +261,4 @@ field_registry fieldUtils.format.mrp_time_counter = fieldUtils.format.float_time; -return FieldEmbedURLViewer; -}); +export default FieldEmbedURLViewer; diff --git a/addons/mrp/static/src/js/mrp_bom_report.js b/addons/mrp/static/src/js/mrp_bom_report.js index 9bcbcfa2ca6..ba599e06a5a 100644 --- a/addons/mrp/static/src/js/mrp_bom_report.js +++ b/addons/mrp/static/src/js/mrp_bom_report.js @@ -1,9 +1,8 @@ -odoo.define('mrp.mrp_bom_report', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var framework = require('web.framework'); -var stock_report_generic = require('stock.stock_report_generic'); +import core from 'web.core'; +import framework from 'web.framework'; +import stock_report_generic from 'stock.stock_report_generic'; var QWeb = core.qweb; var _t = core._t; @@ -225,6 +224,4 @@ var MrpBomReport = stock_report_generic.extend({ }); core.action_registry.add('mrp_bom_report', MrpBomReport); -return MrpBomReport; - -}); +export default MrpBomReport; diff --git a/addons/mrp/static/src/js/mrp_document_kanban_view.js b/addons/mrp/static/src/js/mrp_document_kanban_view.js index e4e936637b1..769832d4ca7 100644 --- a/addons/mrp/static/src/js/mrp_document_kanban_view.js +++ b/addons/mrp/static/src/js/mrp_document_kanban_view.js @@ -1,10 +1,9 @@ -odoo.define('mrp.MrpDocumentsKanbanView', function (require) { -"use strict"; +/** @odoo-module **/ -const KanbanView = require('web.KanbanView'); -const MrpDocumentsKanbanController = require('mrp.MrpDocumentsKanbanController'); -const MrpDocumentsKanbanRenderer = require('mrp.MrpDocumentsKanbanRenderer'); -const viewRegistry = require('web.view_registry'); +import KanbanView from 'web.KanbanView'; +import MrpDocumentsKanbanController from '@mrp/js/mrp_documents_kanban_controller'; +import MrpDocumentsKanbanRenderer from '@mrp/js/mrp_documents_kanban_renderer'; +import viewRegistry from 'web.view_registry'; const MrpDocumentsKanbanView = KanbanView.extend({ config: Object.assign({}, KanbanView.prototype.config, { @@ -15,6 +14,4 @@ const MrpDocumentsKanbanView = KanbanView.extend({ viewRegistry.add('mrp_documents_kanban', MrpDocumentsKanbanView); -return MrpDocumentsKanbanView; - -}); +export default MrpDocumentsKanbanView; diff --git a/addons/mrp/static/src/js/mrp_documents_controller_mixin.js b/addons/mrp/static/src/js/mrp_documents_controller_mixin.js index 9ed0d589800..59ac3850acc 100644 --- a/addons/mrp/static/src/js/mrp_documents_controller_mixin.js +++ b/addons/mrp/static/src/js/mrp_documents_controller_mixin.js @@ -1,9 +1,8 @@ -odoo.define('mrp.controllerMixin', function (require) { -'use strict'; +/** @odoo-module **/ -const { _t, qweb } = require('web.core'); -const fileUploadMixin = require('web.fileUploadMixin'); -const DocumentViewer = require('mrp.MrpDocumentViewer'); +import { _t, qweb } from 'web.core'; +import fileUploadMixin from 'web.fileUploadMixin'; +import DocumentViewer from '@mrp/js/mrp_documents_document_viewer'; const MrpDocumentsControllerMixin = Object.assign({}, fileUploadMixin, { events: { @@ -123,6 +122,4 @@ const MrpDocumentsControllerMixin = Object.assign({}, fileUploadMixin, { }, }); -return MrpDocumentsControllerMixin; - -}); +export default MrpDocumentsControllerMixin; diff --git a/addons/mrp/static/src/js/mrp_documents_document_viewer.js b/addons/mrp/static/src/js/mrp_documents_document_viewer.js index 566590b2ad5..6be8883cf9f 100644 --- a/addons/mrp/static/src/js/mrp_documents_document_viewer.js +++ b/addons/mrp/static/src/js/mrp_documents_document_viewer.js @@ -1,7 +1,6 @@ -odoo.define('mrp.MrpDocumentViewer', function (require) { -"use strict"; +/** @odoo-module **/ -const DocumentViewer = require('@mail/js/document_viewer')[Symbol.for("default")]; +import DocumentViewer from '@mail/js/document_viewer'; /** * This file defines the DocumentViewer for the MRP Documents Kanban view. @@ -13,7 +12,4 @@ const MrpDocumentsDocumentViewer = DocumentViewer.extend({ }, }); -return MrpDocumentsDocumentViewer; - -}); - +export default MrpDocumentsDocumentViewer; diff --git a/addons/mrp/static/src/js/mrp_documents_kanban_controller.js b/addons/mrp/static/src/js/mrp_documents_kanban_controller.js index 9a123dfb970..21b39c15573 100644 --- a/addons/mrp/static/src/js/mrp_documents_kanban_controller.js +++ b/addons/mrp/static/src/js/mrp_documents_kanban_controller.js @@ -1,14 +1,13 @@ -odoo.define('mrp.MrpDocumentsKanbanController', function (require) { -"use strict"; +/** @odoo-module **/ /** * This file defines the Controller for the MRP Documents Kanban view, which is an * override of the KanbanController. */ -const MrpDocumentsControllerMixin = require('mrp.controllerMixin'); +import MrpDocumentsControllerMixin from '@mrp/js/mrp_documents_controller_mixin'; -const KanbanController = require('web.KanbanController'); +import KanbanController from 'web.KanbanController'; const MrpDocumentsKanbanController = KanbanController.extend(MrpDocumentsControllerMixin, { events: Object.assign({}, KanbanController.prototype.events, MrpDocumentsControllerMixin.events), @@ -32,6 +31,4 @@ const MrpDocumentsKanbanController = KanbanController.extend(MrpDocumentsControl }, }); -return MrpDocumentsKanbanController; - -}); +export default MrpDocumentsKanbanController; diff --git a/addons/mrp/static/src/js/mrp_documents_kanban_record.js b/addons/mrp/static/src/js/mrp_documents_kanban_record.js index 445588341ee..c0edbdb6653 100644 --- a/addons/mrp/static/src/js/mrp_documents_kanban_record.js +++ b/addons/mrp/static/src/js/mrp_documents_kanban_record.js @@ -1,11 +1,10 @@ -odoo.define('mrp.MrpDocumentsKanbanRecord', function (require) { -"use strict"; +/** @odoo-module **/ /** * This file defines the KanbanRecord for the MRP Documents Kanban view. */ -const KanbanRecord = require('web.KanbanRecord'); +import KanbanRecord from 'web.KanbanRecord'; const MrpDocumentsKanbanRecord = KanbanRecord.extend({ events: Object.assign({}, KanbanRecord.prototype.events, { @@ -45,6 +44,4 @@ const MrpDocumentsKanbanRecord = KanbanRecord.extend({ }, }); -return MrpDocumentsKanbanRecord; - -}); +export default MrpDocumentsKanbanRecord; diff --git a/addons/mrp/static/src/js/mrp_documents_kanban_renderer.js b/addons/mrp/static/src/js/mrp_documents_kanban_renderer.js index 79ffffe7aee..b10d44797ba 100644 --- a/addons/mrp/static/src/js/mrp_documents_kanban_renderer.js +++ b/addons/mrp/static/src/js/mrp_documents_kanban_renderer.js @@ -1,13 +1,12 @@ -odoo.define('mrp.MrpDocumentsKanbanRenderer', function (require) { -"use strict"; +/** @odoo-module **/ /** * This file defines the Renderer for the MRP Documents Kanban view, which is an * override of the KanbanRenderer. */ -const KanbanRenderer = require('web.KanbanRenderer'); -const MrpDocumentsKanbanRecord = require('mrp.MrpDocumentsKanbanRecord'); +import KanbanRenderer from 'web.KanbanRenderer'; +import MrpDocumentsKanbanRecord from '@mrp/js/mrp_documents_kanban_record'; const MrpDocumentsKanbanRenderer = KanbanRenderer.extend({ config: Object.assign({}, KanbanRenderer.prototype.config, { @@ -22,6 +21,4 @@ const MrpDocumentsKanbanRenderer = KanbanRenderer.extend({ }, }); -return MrpDocumentsKanbanRenderer; - -}); +export default MrpDocumentsKanbanRenderer; diff --git a/addons/mrp/static/src/js/mrp_field_one2many_with_copy.js b/addons/mrp/static/src/js/mrp_field_one2many_with_copy.js index e2c3c6f4749..8bc7b528529 100644 --- a/addons/mrp/static/src/js/mrp_field_one2many_with_copy.js +++ b/addons/mrp/static/src/js/mrp_field_one2many_with_copy.js @@ -1,14 +1,11 @@ -odoo.define('mrp.MrpFieldOne2ManyWithCopy', function (require) { +/** @odoo-module **/ -"use strict"; - -var FieldOne2Many = require('web.relational_fields').FieldOne2Many; -var ListRenderer = require('web.ListRenderer'); -var fieldRegistry = require('web.field_registry'); -const {_t} = require('web.core'); +import { FieldOne2Many } from 'web.relational_fields'; +import ListRenderer from 'web.ListRenderer'; +import fieldRegistry from 'web.field_registry'; +import {_t} from 'web.core'; //---------------------------------------------------- -var dialogs = require('web.view_dialogs'); var MrpFieldOne2ManyWithCopyListRenderer = ListRenderer.extend({ @@ -80,6 +77,4 @@ var MrpFieldOne2ManyWithCopy = FieldOne2Many.extend({ fieldRegistry.add('mrp_one2many_with_copy', MrpFieldOne2ManyWithCopy); -return MrpFieldOne2ManyWithCopy; - -}); +export default MrpFieldOne2ManyWithCopy; diff --git a/addons/mrp/static/src/js/mrp_should_consume.js b/addons/mrp/static/src/js/mrp_should_consume.js index d432c5cf3f7..359c912f77e 100644 --- a/addons/mrp/static/src/js/mrp_should_consume.js +++ b/addons/mrp/static/src/js/mrp_should_consume.js @@ -1,11 +1,8 @@ -odoo.define('mrp.should_consume', function (require) { -"use strict"; - -const BasicFields = require('web.basic_fields'); -const FieldFloat = BasicFields.FieldFloat; -const fieldRegistry = require('web.field_registry'); -const field_utils = require('web.field_utils'); +/** @odoo-module **/ +import { FieldFloat } from 'web.basic_fields'; +import fieldRegistry from 'web.field_registry'; +import field_utils from 'web.field_utils'; /** * This widget is used to display alongside the total quantity to consume of a production order, * the exact quantity that the worker should consume depending on the BoM. Ex: @@ -74,8 +71,6 @@ const MrpShouldConsume = FieldFloat.extend({ fieldRegistry.add('mrp_should_consume', MrpShouldConsume); -return { +export default { MrpShouldConsume: MrpShouldConsume, }; - -}); diff --git a/addons/mrp/static/src/js/mrp_workorder_popover.js b/addons/mrp/static/src/js/mrp_workorder_popover.js index 7e392c09c7a..94a9819d138 100644 --- a/addons/mrp/static/src/js/mrp_workorder_popover.js +++ b/addons/mrp/static/src/js/mrp_workorder_popover.js @@ -1,10 +1,8 @@ -odoo.define('mrp.mrp_workorder_popover', function (require) { -'use strict'; +/** @odoo-module **/ -var PopoverWidget = require('stock.popover_widget'); -var fieldRegistry = require('web.field_registry'); -var core = require('web.core'); -var _t = core._t; +import PopoverWidget from 'stock.popover_widget'; +import fieldRegistry from 'web.field_registry'; +import { _t } from 'web.core'; /** @@ -47,5 +45,4 @@ var MrpWorkorderPopover = PopoverWidget.extend({ fieldRegistry.add('mrp_workorder_popover', MrpWorkorderPopover); -return MrpWorkorderPopover; -}); +export default MrpWorkorderPopover; diff --git a/addons/mrp/static/tests/mrp_document_kanban_tests.js b/addons/mrp/static/tests/mrp_document_kanban_tests.js index 366bb1bd1da..65551b2f050 100644 --- a/addons/mrp/static/tests/mrp_document_kanban_tests.js +++ b/addons/mrp/static/tests/mrp_document_kanban_tests.js @@ -1,9 +1,8 @@ -odoo.define('mrp.document_kanban_tests', function (require) { -"use strict"; +/** @odoo-module **/ -const MrpDocumentsKanbanView = require('mrp.MrpDocumentsKanbanView'); -const MrpDocumentsKanbanController = require('mrp.MrpDocumentsKanbanController'); -const testUtils = require('web.test_utils'); +import MrpDocumentsKanbanView from '@mrp/js/mrp_document_kanban_view'; +import MrpDocumentsKanbanController from '@mrp/js/mrp_documents_kanban_controller'; +import testUtils from 'web.test_utils'; const createView = testUtils.createView; @@ -168,5 +167,3 @@ QUnit.module('MrpDocumentsKanbanView', { }); }); - -}); diff --git a/addons/mrp/static/tests/mrp_tests.js b/addons/mrp/static/tests/mrp_tests.js index f05a5b420af..a789f067bbc 100644 --- a/addons/mrp/static/tests/mrp_tests.js +++ b/addons/mrp/static/tests/mrp_tests.js @@ -1,8 +1,7 @@ -odoo.define('mrp.tests', function (require) { -"use strict"; +/** @odoo-module **/ -var FormView = require('web.FormView'); -var testUtils = require("web.test_utils"); +import FormView from 'web.FormView'; +import testUtils from "web.test_utils"; var createView = testUtils.createView; @@ -130,4 +129,3 @@ QUnit.module('mrp', { form.destroy(); }); }); -}); diff --git a/addons/note/static/src/js/systray_activity_menu.js b/addons/note/static/src/js/systray_activity_menu.js index f948659db0d..654de17a71d 100644 --- a/addons/note/static/src/js/systray_activity_menu.js +++ b/addons/note/static/src/js/systray_activity_menu.js @@ -1,12 +1,9 @@ -odoo.define('note.systray.ActivityMenu', function (require) { -"use strict"; +/** @odoo-module **/ -var ActivityMenu = require('@mail/js/systray/systray_activity_menu')[Symbol.for("default")]; +import ActivityMenu from '@mail/js/systray/systray_activity_menu'; -var core = require('web.core'); -var datepicker = require('web.datepicker'); - -var _t = core._t; +import { _t } from 'web.core'; +import datepicker from 'web.datepicker'; ActivityMenu.include({ events: _.extend({}, ActivityMenu.prototype.events, { @@ -134,4 +131,3 @@ ActivityMenu.include({ } }, }); -}); diff --git a/addons/note/static/tests/systray_activity_menu_tests.js b/addons/note/static/tests/systray_activity_menu_tests.js index 415e876973d..249d6fd1ec5 100644 --- a/addons/note/static/tests/systray_activity_menu_tests.js +++ b/addons/note/static/tests/systray_activity_menu_tests.js @@ -1,10 +1,9 @@ -odoo.define('note.systray.ActivityMenuTests', function (require) { -"use strict"; +/** @odoo-module **/ -var ActivityMenu = require('@mail/js/systray/systray_activity_menu')[Symbol.for("default")]; -const { afterEach, beforeEach, start } = require('@mail/utils/test_utils'); +import ActivityMenu from '@mail/js/systray/systray_activity_menu'; +import { afterEach, beforeEach, start } from '@mail/utils/test_utils'; -var testUtils = require('web.test_utils'); +import testUtils from 'web.test_utils'; QUnit.module('note', {}, function () { QUnit.module("ActivityMenu", { @@ -126,5 +125,3 @@ QUnit.test('note activity menu widget: create note from activity menu', async fu widget.destroy(); }); }); - -}); diff --git a/addons/sms/static/src/components/message/message_tests.js b/addons/sms/static/src/components/message/message_tests.js index f4fcfbcf5ae..d9e27ea9492 100644 --- a/addons/sms/static/src/components/message/message_tests.js +++ b/addons/sms/static/src/components/message/message_tests.js @@ -1,17 +1,16 @@ -odoo.define('sms/static/src/components/message/message_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { create, insert, link } = require('@mail/model/model_field_command'); -const { makeDeferred } = require('@mail/utils/deferred/deferred'); -const { +import { create, insert, link } from '@mail/model/model_field_command'; +import { makeDeferred } from '@mail/utils/deferred/deferred'; +import { afterEach, afterNextRender, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; -const Bus = require('web.Bus'); +import Bus from 'web.Bus'; QUnit.module('sms', {}, function () { QUnit.module('components', {}, function () { @@ -191,5 +190,3 @@ QUnit.test('Notification Error', async function (assert) { }); }); }); - -}); diff --git a/addons/sms/static/src/components/notification_group/notification_group.js b/addons/sms/static/src/components/notification_group/notification_group.js index 6ada2503b0a..ab3002efbba 100644 --- a/addons/sms/static/src/components/notification_group/notification_group.js +++ b/addons/sms/static/src/components/notification_group/notification_group.js @@ -1,13 +1,10 @@ -odoo.define('sms/static/src/components/notification_group/notification_group.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { NotificationGroup } = require('@mail/components/notification_group/notification_group'); +import { NotificationGroup } from '@mail/components/notification_group/notification_group'; -const { patch } = require('web.utils'); +import { patch } from 'web.utils'; -const components = { NotificationGroup }; - -patch(components.NotificationGroup.prototype, 'sms/static/src/components/notification_group/notification_group.js', { +patch(NotificationGroup.prototype, 'sms/static/src/components/notification_group/notification_group.js', { //-------------------------------------------------------------------------- // Public @@ -23,5 +20,3 @@ patch(components.NotificationGroup.prototype, 'sms/static/src/components/notific return this._super(...arguments); }, }); - -}); diff --git a/addons/sms/static/src/js/fields_sms_widget.js b/addons/sms/static/src/js/fields_sms_widget.js index a0e4e259b95..aa10bffddae 100644 --- a/addons/sms/static/src/js/fields_sms_widget.js +++ b/addons/sms/static/src/js/fields_sms_widget.js @@ -1,11 +1,8 @@ -odoo.define('sms.sms_widget', function (require) { -"use strict"; +/** @odoo-module **/ -var core = require('web.core'); -var fieldRegistry = require('web.field_registry'); -var FieldTextEmojis = require('@mail/js/field_text_emojis')[Symbol.for("default")]; - -var _t = core._t; +import { _t } from 'web.core'; +import fieldRegistry from 'web.field_registry'; +import FieldTextEmojis from '@mail/js/field_text_emojis'; /** * SmsWidget is a widget to display a textarea (the body) and a text representing * the number of SMS and the number of characters. This text is computed every @@ -181,5 +178,4 @@ var SmsWidget = FieldTextEmojis.extend({ fieldRegistry.add('sms_widget', SmsWidget); -return SmsWidget; -}); +export default SmsWidget; diff --git a/addons/sms/static/src/models/message/message.js b/addons/sms/static/src/models/message/message.js index 244d95ef211..d8c72c1080c 100644 --- a/addons/sms/static/src/models/message/message.js +++ b/addons/sms/static/src/models/message/message.js @@ -1,9 +1,8 @@ -odoo.define('sms/static/src/models/message/message.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, -} = require('@mail/model/model_core'); +} from '@mail/model/model_core'; registerInstancePatchModel('mail.message', 'sms/static/src/models/message/message.js', { @@ -29,5 +28,3 @@ registerInstancePatchModel('mail.message', 'sms/static/src/models/message/messag } }, }); - -}); diff --git a/addons/sms/static/src/models/notification_group/notification_group.js b/addons/sms/static/src/models/notification_group/notification_group.js index 1f213d77041..a05a0e84a18 100644 --- a/addons/sms/static/src/models/notification_group/notification_group.js +++ b/addons/sms/static/src/models/notification_group/notification_group.js @@ -1,9 +1,8 @@ -odoo.define('sms/static/src/models/notification_group/notification_group.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, -} = require('@mail/model/model_core'); +} from '@mail/model/model_core'; registerInstancePatchModel('mail.notification_group', 'sms/static/src/models/notification_group/notification_group.js', { @@ -58,5 +57,3 @@ registerInstancePatchModel('mail.notification_group', 'sms/static/src/models/not } }, }); - -}); diff --git a/addons/sms/static/tests/sms_widget_test.js b/addons/sms/static/tests/sms_widget_test.js index 6b12ab08223..9d8d2c3001a 100644 --- a/addons/sms/static/tests/sms_widget_test.js +++ b/addons/sms/static/tests/sms_widget_test.js @@ -1,10 +1,8 @@ -odoo.define('sms.sms_widget_tests', function (require) { -"use strict"; +/** @odoo-module **/ -var config = require('web.config'); -var FormView = require('web.FormView'); -var ListView = require('web.ListView'); -var testUtils = require('web.test_utils'); +import FormView from 'web.FormView'; +import ListView from 'web.ListView'; +import testUtils from 'web.test_utils'; var createView = testUtils.createView; @@ -226,4 +224,3 @@ QUnit.module('fields', { form.destroy(); }); }); -}); diff --git a/addons/snailmail/static/src/components/message/message.js b/addons/snailmail/static/src/components/message/message.js index 06cd4699366..90e2ee5cc49 100644 --- a/addons/snailmail/static/src/components/message/message.js +++ b/addons/snailmail/static/src/components/message/message.js @@ -1,9 +1,8 @@ -odoo.define('snailmail/static/src/components/message/message.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { Message } = require("@mail/components/message/message"); +import { Message } from '@mail/components/message/message'; -const { patch } = require('web.utils'); +import { patch } from 'web.utils'; const { useState } = owl; @@ -74,5 +73,3 @@ patch(Message.prototype, 'snailmail/static/src/components/message/message.js', { this.snailmailState.hasDialog = false; }, }); - -}); diff --git a/addons/snailmail/static/src/components/message/message_tests.js b/addons/snailmail/static/src/components/message/message_tests.js index bff24479ea7..398e8fe0f88 100644 --- a/addons/snailmail/static/src/components/message/message_tests.js +++ b/addons/snailmail/static/src/components/message/message_tests.js @@ -1,16 +1,15 @@ -odoo.define('snailmail/static/src/components/message/message_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { create, insert, link } = require('@mail/model/model_field_command'); -const { +import { create, insert, link } from '@mail/model/model_field_command'; +import { afterEach, afterNextRender, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; -const Bus = require('web.Bus'); +import Bus from 'web.Bus'; QUnit.module('snailmail', {}, function () { QUnit.module('components', {}, function () { @@ -674,5 +673,3 @@ QUnit.test('Missing Required Fields', async function (assert) { }); }); }); - -}); diff --git a/addons/snailmail/static/src/components/notification_group/notification_group.js b/addons/snailmail/static/src/components/notification_group/notification_group.js index fcab2597fc6..a36d8f5678b 100644 --- a/addons/snailmail/static/src/components/notification_group/notification_group.js +++ b/addons/snailmail/static/src/components/notification_group/notification_group.js @@ -1,13 +1,10 @@ -odoo.define('snailmail/static/src/components/notification_group/notification_group.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { NotificationGroup } = require('@mail/components/notification_group/notification_group'); +import { NotificationGroup } from '@mail/components/notification_group/notification_group'; -const { patch } = require('web.utils'); +import { patch } from 'web.utils'; -const components = { NotificationGroup }; - -patch(components.NotificationGroup.prototype, 'snailmail/static/src/components/notification_group/notification_group.js', { +patch(NotificationGroup.prototype, 'snailmail/static/src/components/notification_group/notification_group.js', { //-------------------------------------------------------------------------- // Public @@ -23,5 +20,3 @@ patch(components.NotificationGroup.prototype, 'snailmail/static/src/components/n return this._super(...arguments); }, }); - -}); diff --git a/addons/snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js b/addons/snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js index b282be553aa..34a80641843 100644 --- a/addons/snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js +++ b/addons/snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js @@ -1,14 +1,13 @@ -odoo.define('snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { afterEach, beforeEach, createRootMessagingComponent, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; -const Bus = require('web.Bus'); +import Bus from 'web.Bus'; QUnit.module('snailmail', {}, function () { QUnit.module('components', {}, function () { @@ -296,5 +295,3 @@ QUnit.test('grouped notifications by document model', async function (assert) { }); }); }); - -}); diff --git a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js index 21d03f7b7d5..f95a38204a7 100644 --- a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js +++ b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js @@ -1,9 +1,8 @@ -odoo.define('snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerMessagingComponent } = require('@mail/utils/messaging_component'); +import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const Dialog = require('web.OwlDialog'); +import Dialog from 'web.OwlDialog'; const { Component } = owl; const { useRef } = owl.hooks; @@ -94,6 +93,4 @@ Object.assign(SnailmailErrorDialog, { registerMessagingComponent(SnailmailErrorDialog); -return SnailmailErrorDialog; - -}); +export default SnailmailErrorDialog; diff --git a/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js b/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js index 50ce7b3e3bd..604567c30d4 100644 --- a/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js +++ b/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js @@ -1,7 +1,6 @@ -odoo.define('snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerMessagingComponent } = require('@mail/utils/messaging_component'); +import { registerMessagingComponent } from '@mail/utils/messaging_component'; const { Component } = owl; @@ -65,6 +64,4 @@ Object.assign(SnailmailNotificationPopover, { registerMessagingComponent(SnailmailNotificationPopover); -return SnailmailNotificationPopover; - -}); +export default SnailmailNotificationPopover; diff --git a/addons/snailmail/static/src/models/message/message.js b/addons/snailmail/static/src/models/message/message.js index 5409bb8bbbc..d2e9fa00eb6 100644 --- a/addons/snailmail/static/src/models/message/message.js +++ b/addons/snailmail/static/src/models/message/message.js @@ -1,7 +1,6 @@ -odoo.define('snailmail/static/src/models/message.message.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerInstancePatchModel } = require('@mail/model/model_core'); +import { registerInstancePatchModel } from '@mail/model/model_core'; registerInstancePatchModel('mail.message', 'snailmail/static/src/models/message.message.js', { @@ -65,5 +64,3 @@ registerInstancePatchModel('mail.message', 'snailmail/static/src/models/message. })); }, }); - -}); diff --git a/addons/snailmail/static/src/models/messaging/messaging.js b/addons/snailmail/static/src/models/messaging/messaging.js index 99f4ccc4c3b..5694e731f4d 100644 --- a/addons/snailmail/static/src/models/messaging/messaging.js +++ b/addons/snailmail/static/src/models/messaging/messaging.js @@ -1,11 +1,10 @@ -odoo.define('snailmail/static/src/models/messaging/messaging.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, registerFieldPatchModel, -} = require('@mail/model/model_core'); -const { attr } = require('@mail/model/model_field'); +} from '@mail/model/model_core'; +import { attr } from '@mail/model/model_field'; registerInstancePatchModel('mail.messaging', 'snailmail/static/src/models/messaging/messaging.js', { async fetchSnailmailCreditsUrl() { @@ -34,5 +33,3 @@ registerFieldPatchModel('mail.messaging', 'snailmail/static/src/models/messaging snailmail_credits_url: attr(), snailmail_credits_url_trial: attr(), }); - -}); diff --git a/addons/snailmail/static/src/models/notification_group/notification_group.js b/addons/snailmail/static/src/models/notification_group/notification_group.js index cb388a817cd..d2c55fd9774 100644 --- a/addons/snailmail/static/src/models/notification_group/notification_group.js +++ b/addons/snailmail/static/src/models/notification_group/notification_group.js @@ -1,9 +1,8 @@ -odoo.define('snailmail/static/src/models/notification_group/notification_group.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerInstancePatchModel, -} = require('@mail/model/model_core'); +} from '@mail/model/model_core'; registerInstancePatchModel('mail.notification_group', 'snailmail/static/src/models/notification_group/notification_group.js', { @@ -58,5 +57,3 @@ registerInstancePatchModel('mail.notification_group', 'snailmail/static/src/mode } }, }); - -}); diff --git a/addons/snailmail/static/tests/helpers/mock_server.js b/addons/snailmail/static/tests/helpers/mock_server.js index c3cc3210792..aa804f6a67b 100644 --- a/addons/snailmail/static/tests/helpers/mock_server.js +++ b/addons/snailmail/static/tests/helpers/mock_server.js @@ -1,7 +1,6 @@ -odoo.define('snailmail/static/tests/helpers/mock_server.js', function (require) { -"use strict"; +/** @odoo-module **/ -const MockServer = require('web.MockServer'); +import MockServer from 'web.MockServer'; MockServer.include({ //-------------------------------------------------------------------------- @@ -46,5 +45,3 @@ MockServer.include({ // TODO implement this mock and improve related tests (task-2300496) }, }); - -}); diff --git a/addons/website_livechat/static/src/components/discuss/discuss_tests.js b/addons/website_livechat/static/src/components/discuss/discuss_tests.js index 3aaadee3812..6a8e78d6882 100644 --- a/addons/website_livechat/static/src/components/discuss/discuss_tests.js +++ b/addons/website_livechat/static/src/components/discuss/discuss_tests.js @@ -1,11 +1,10 @@ -odoo.define('website_livechat/static/src/components/discuss/discuss_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { afterEach, beforeEach, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; QUnit.module('website_livechat', {}, function () { QUnit.module('components', {}, function () { @@ -265,5 +264,3 @@ QUnit.test('non-livechat channel should not show visitor banner', async function }); }); }); - -}); diff --git a/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js b/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js index 30949e6415e..8af60399237 100644 --- a/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js +++ b/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js @@ -1,7 +1,6 @@ -odoo.define('website_livechat/static/src/components/visitor_banner/visitor_banner.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerMessagingComponent } = require('@mail/utils/messaging_component'); +import { registerMessagingComponent } from '@mail/utils/messaging_component'; const { Component } = owl; @@ -29,6 +28,4 @@ Object.assign(VisitorBanner, { registerMessagingComponent(VisitorBanner); -return VisitorBanner; - -}); +export default VisitorBanner; diff --git a/addons/website_livechat/static/src/js/website_livechat.editor.js b/addons/website_livechat/static/src/js/website_livechat.editor.js index 288f2af0e97..67f68bba9d9 100644 --- a/addons/website_livechat/static/src/js/website_livechat.editor.js +++ b/addons/website_livechat/static/src/js/website_livechat.editor.js @@ -1,11 +1,8 @@ -odoo.define('website_livechat.editor', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var wUtils = require('website.utils'); -var WebsiteNewMenu = require('website.newMenu'); - -var _t = core._t; +import { _t } from 'web.core'; +import wUtils from 'website.utils'; +import WebsiteNewMenu from 'website.newMenu'; WebsiteNewMenu.include({ actions: _.extend({}, WebsiteNewMenu.prototype.actions || {}, { @@ -47,5 +44,3 @@ WebsiteNewMenu.include({ }); }, }); - -}); diff --git a/addons/website_livechat/static/src/legacy/public_livechat.js b/addons/website_livechat/static/src/legacy/public_livechat.js index 3cd2cc1d41d..dae0519bd6d 100644 --- a/addons/website_livechat/static/src/legacy/public_livechat.js +++ b/addons/website_livechat/static/src/legacy/public_livechat.js @@ -26,7 +26,7 @@ LivechatButton.include({ /** * @override */ - start() { + start() { // We trigger a resize to launch the event that checks if this element hides // a button when the page is loaded. $(window).trigger('resize'); diff --git a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js index 2330a96c751..f3a7dfba5cf 100644 --- a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js +++ b/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js @@ -1,7 +1,6 @@ -odoo.define('website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerInstancePatchModel } = require('@mail/model/model_core'); +import { registerInstancePatchModel } from '@mail/model/model_core'; registerInstancePatchModel('mail.messaging_notification_handler', 'website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js', { @@ -28,5 +27,3 @@ registerInstancePatchModel('mail.messaging_notification_handler', 'website_livec return this._super(data); }, }); - -}); diff --git a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js b/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js index e900892e8ce..248f9f7e1cf 100644 --- a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js +++ b/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js @@ -1,19 +1,14 @@ -odoo.define('website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { afterEach, afterNextRender, beforeEach, start, -} = require('@mail/utils/test_utils'); +} from '@mail/utils/test_utils'; -const FormView = require('web.FormView'); -const { - mock: { - intercept, - }, -} = require('web.test_utils'); +import FormView from 'web.FormView'; +import { mock } from 'web.test_utils'; QUnit.module('website_livechat', {}, function () { QUnit.module('models', {}, function () { @@ -59,7 +54,7 @@ QUnit.test('should open chat window on send chat request to website visitor', as `, res_id: 11, }); - intercept(this.widget, 'execute_action', payload => { + mock.intercept(this.widget, 'execute_action', payload => { this.env.services.rpc({ route: '/web/dataset/call_button', params: { @@ -94,5 +89,3 @@ QUnit.test('should open chat window on send chat request to website visitor', as }); }); }); - -}); diff --git a/addons/website_livechat/static/src/models/thread/thread.js b/addons/website_livechat/static/src/models/thread/thread.js index 1a1b28c4b8e..046da17ef45 100644 --- a/addons/website_livechat/static/src/models/thread/thread.js +++ b/addons/website_livechat/static/src/models/thread/thread.js @@ -1,12 +1,11 @@ -odoo.define('website_livechat/static/src/models/thread/thread.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { +import { registerClassPatchModel, registerFieldPatchModel, -} = require('@mail/model/model_core'); -const { many2one } = require('@mail/model/model_field'); -const { insert, unlink } = require('@mail/model/model_field_command'); +} from '@mail/model/model_core'; +import { many2one } from '@mail/model/model_field'; +import { insert, unlink } from '@mail/model/model_field_command'; registerClassPatchModel('mail.thread', 'website_livechat/static/src/models/thread/thread.js', { @@ -39,5 +38,3 @@ registerFieldPatchModel('mail.thread', 'website_livechat/static/src/models/threa inverse: 'threads', }), }); - -}); diff --git a/addons/website_livechat/static/src/models/visitor/visitor.js b/addons/website_livechat/static/src/models/visitor/visitor.js index b729592cbae..9ae59d32890 100644 --- a/addons/website_livechat/static/src/models/visitor/visitor.js +++ b/addons/website_livechat/static/src/models/visitor/visitor.js @@ -1,9 +1,8 @@ -odoo.define('website_livechat/static/src/models/partner/partner.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { registerNewModel } = require('@mail/model/model_core'); -const { attr, many2one, one2many } = require('@mail/model/model_field'); -const { insert, link, unlink } = require('@mail/model/model_field_command'); +import { registerNewModel } from '@mail/model/model_core'; +import { attr, many2one, one2many } from '@mail/model/model_field'; +import { insert, link, unlink } from '@mail/model/model_field_command'; function factory(dependencies) { @@ -147,5 +146,3 @@ function factory(dependencies) { } registerNewModel('website_livechat.visitor', factory); - -}); diff --git a/addons/website_livechat/static/tests/helpers/mock_models.js b/addons/website_livechat/static/tests/helpers/mock_models.js index fff3bd2da4d..1ce529400e4 100644 --- a/addons/website_livechat/static/tests/helpers/mock_models.js +++ b/addons/website_livechat/static/tests/helpers/mock_models.js @@ -1,8 +1,7 @@ -odoo.define('website_livechat/static/tests/helpers/mock_models.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { MockModels } = require('@mail/../tests/helpers/mock_models'); -const { patch } = require('web.utils'); +import { MockModels } from '@mail/../tests/helpers/mock_models'; +import { patch } from 'web.utils'; patch(MockModels, 'website_livechat/static/tests/helpers/mock_models.js', { @@ -40,5 +39,3 @@ patch(MockModels, 'website_livechat/static/tests/helpers/mock_models.js', { }, }); - -}); diff --git a/addons/website_livechat/static/tests/helpers/mock_server.js b/addons/website_livechat/static/tests/helpers/mock_server.js index 45a7571c4e0..185f911f4b6 100644 --- a/addons/website_livechat/static/tests/helpers/mock_server.js +++ b/addons/website_livechat/static/tests/helpers/mock_server.js @@ -1,9 +1,8 @@ -odoo.define('website_livechat/static/tests/helpers/mock_server.js', function (require) { -'use strict'; +/** @odoo-module **/ -require('@im_livechat/../tests/helpers/mock_server'); // ensure mail overrides are applied first +import '@im_livechat/../tests/helpers/mock_server'; // ensure mail overrides are applied first -const MockServer = require('web.MockServer'); +import MockServer from 'web.MockServer'; MockServer.include({ /** @@ -74,5 +73,3 @@ MockServer.include({ } }, }); - -}); diff --git a/addons/website_sale_slides/static/src/js/slides_course_join.js b/addons/website_sale_slides/static/src/js/slides_course_join.js index 4fe1c28a7ba..af467ca82bb 100644 --- a/addons/website_sale_slides/static/src/js/slides_course_join.js +++ b/addons/website_sale_slides/static/src/js/slides_course_join.js @@ -1,7 +1,7 @@ odoo.define('website_sale_slides.course.join.widget', function (require) { "use strict"; -var CourseJoinWidget = require('website_slides.course.join.widget').courseJoinWidget; +var CourseJoinWidget = require('@website_slides/js/slides_course_join')[Symbol.for("default")].courseJoinWidget; const wUtils = require('website.utils'); CourseJoinWidget.include({ diff --git a/addons/website_sale_slides/static/src/js/slides_course_quiz.js b/addons/website_sale_slides/static/src/js/slides_course_quiz.js index 3922a631a30..0670f5079cb 100644 --- a/addons/website_sale_slides/static/src/js/slides_course_quiz.js +++ b/addons/website_sale_slides/static/src/js/slides_course_quiz.js @@ -2,7 +2,7 @@ odoo.define('website_sale_slides.quiz', function (require) { "use strict"; var sAnimations = require('website.content.snippets.animation'); -var Quiz = require('website_slides.quiz').Quiz; +var { Quiz } = require('@website_slides/js/slides_course_quiz'); sAnimations.registry.websiteSlidesQuizNoFullscreen.include({ _extractChannelData: function (slideData) { diff --git a/addons/website_sale_slides/static/src/js/slides_course_unsubscribe.js b/addons/website_sale_slides/static/src/js/slides_course_unsubscribe.js index 34449ce7993..0ea633c08c8 100644 --- a/addons/website_sale_slides/static/src/js/slides_course_unsubscribe.js +++ b/addons/website_sale_slides/static/src/js/slides_course_unsubscribe.js @@ -1,7 +1,7 @@ odoo.define('website_sale_slides.unsubscribe_modal', function (require) { "use strict"; -var SlidesUnsubscribe = require('website_slides.unsubscribe_modal'); +var SlidesUnsubscribe = require('@website_slides/js/slides_course_unsubscribe')[Symbol.for("default")]; SlidesUnsubscribe.websiteSlidesUnsubscribe.include({ xmlDependencies: (SlidesUnsubscribe.websiteSlidesUnsubscribe.prototype.xmlDependencies || []).concat( diff --git a/addons/website_slides/static/src/components/activity/activity.js b/addons/website_slides/static/src/components/activity/activity.js index 0a09e358d13..2e1722333ca 100644 --- a/addons/website_slides/static/src/components/activity/activity.js +++ b/addons/website_slides/static/src/components/activity/activity.js @@ -1,13 +1,10 @@ -odoo.define('website_slides/static/src/components/activity/activity.js', function (require) { -'use strict'; +/** @odoo-module **/ -const { Activity } = require('@mail/components/activity/activity'); +import { Activity } from '@mail/components/activity/activity'; -const { patch } = require('web.utils'); +import { patch } from 'web.utils'; -const components = { Activity }; - -patch(components.Activity.prototype, 'website_slides/static/src/components/activity/activity.js', { +patch(Activity.prototype, 'website_slides/static/src/components/activity/activity.js', { //-------------------------------------------------------------------------- // Handlers @@ -38,5 +35,3 @@ patch(components.Activity.prototype, 'website_slides/static/src/components/activ this.trigger('reload'); }, }); - -}); diff --git a/addons/website_slides/static/src/js/portal_chatter.js b/addons/website_slides/static/src/js/portal_chatter.js index 78f173bc43f..4a81d795d01 100644 --- a/addons/website_slides/static/src/js/portal_chatter.js +++ b/addons/website_slides/static/src/js/portal_chatter.js @@ -1,9 +1,7 @@ -odoo.define('website_slides.portal_chatter', function (require) { -'use strict'; - -const { _t } = require('web.core'); -const PortalChatter = require('portal.chatter').PortalChatter; +/** @odoo-module **/ +import { _t } from 'web.core'; +import { PortalChatter } from 'portal.chatter'; /** * PortalChatter @@ -24,4 +22,3 @@ PortalChatter.include({ } }, }); -}); diff --git a/addons/website_slides/static/src/js/rating_field_backend.js b/addons/website_slides/static/src/js/rating_field_backend.js index 12a6d8b63b7..e7dfd1a7633 100644 --- a/addons/website_slides/static/src/js/rating_field_backend.js +++ b/addons/website_slides/static/src/js/rating_field_backend.js @@ -1,12 +1,9 @@ -odoo.define('website_slides.ratingField', function (require) { -"use strict"; +/** @odoo-module **/ -var basicFields = require('web.basic_fields'); -var fieldRegistry = require('web.field_registry'); +import basicFields from 'web.basic_fields'; +import fieldRegistry from 'web.field_registry'; -var core = require('web.core'); - -var QWeb = core.qweb; +import { qweb as QWeb} from 'web.core'; var FieldFloatRating = basicFields.FieldFloat.extend({ xmlDependencies: !basicFields.FieldFloat.prototype.xmlDependencies ? @@ -35,8 +32,6 @@ var FieldFloatRating = basicFields.FieldFloat.extend({ fieldRegistry.add('field_float_rating', FieldFloatRating); -return { +export default { FieldFloatRating: FieldFloatRating, }; - -}); diff --git a/addons/website_slides/static/src/js/slide_category_one2many.js b/addons/website_slides/static/src/js/slide_category_one2many.js index adb84d602fb..923648b7b25 100644 --- a/addons/website_slides/static/src/js/slide_category_one2many.js +++ b/addons/website_slides/static/src/js/slide_category_one2many.js @@ -1,11 +1,10 @@ -odoo.define('survey.slide_category_one2many', function (require){ -"use strict"; +/** @odoo-module **/ -var Context = require('web.Context'); -var FieldOne2Many = require('web.relational_fields').FieldOne2Many; -var FieldRegistry = require('web.field_registry'); -var ListRenderer = require('web.ListRenderer'); -var config = require('web.config'); +import Context from 'web.Context'; +import { FieldOne2Many } from 'web.relational_fields'; +import FieldRegistry from 'web.field_registry'; +import ListRenderer from 'web.ListRenderer'; +import config from 'web.config'; var SectionListRenderer = ListRenderer.extend({ init: function (parent, state, params) { @@ -179,4 +178,3 @@ var SectionFieldOne2Many = FieldOne2Many.extend({ }); FieldRegistry.add('slide_category_one2many', SectionFieldOne2Many); -}); \ No newline at end of file diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js index 4f081013de1..4213cde9a8a 100644 --- a/addons/website_slides/static/src/js/slides.js +++ b/addons/website_slides/static/src/js/slides.js @@ -1,8 +1,7 @@ -odoo.define('website_slides.slides', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var time = require('web.time'); +import publicWidget from 'web.public.widget'; +import time from 'web.time'; publicWidget.registry.websiteSlides = publicWidget.Widget.extend({ selector: '#wrapwrap', @@ -32,18 +31,10 @@ publicWidget.registry.websiteSlides = publicWidget.Widget.extend({ }, }); -return publicWidget.registry.websiteSlides; - -}); +export default publicWidget.registry.websiteSlides; //============================================================================== -odoo.define('website_slides.slides_embed', function (require) { -'use strict'; - -var publicWidget = require('web.public.widget'); -require('website_slides.slides'); - var SlideSocialEmbed = publicWidget.Widget.extend({ events: { 'change input': '_onChangePage', @@ -120,5 +111,3 @@ publicWidget.registry.websiteSlidesEmbed = publicWidget.Widget.extend({ new SlideSocialEmbed(this, maxPage).attachTo($('.oe_slide_js_embed_code_widget')); }, }); - -}); diff --git a/addons/website_slides/static/src/js/slides_category_add.js b/addons/website_slides/static/src/js/slides_category_add.js index e11ba2a4d5e..ac1f7e16ddc 100644 --- a/addons/website_slides/static/src/js/slides_category_add.js +++ b/addons/website_slides/static/src/js/slides_category_add.js @@ -1,10 +1,8 @@ -odoo.define('website_slides.category.add', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var Dialog = require('web.Dialog'); -var core = require('web.core'); -var _t = core._t; +import publicWidget from 'web.public.widget'; +import Dialog from 'web.Dialog'; +import { _t } from 'web.core'; var CategoryAddDialog = Dialog.extend({ template: 'slides.category.add', @@ -76,9 +74,7 @@ publicWidget.registry.websiteSlidesCategoryAdd = publicWidget.Widget.extend({ }, }); -return { +export default { categoryAddDialog: CategoryAddDialog, websiteSlidesCategoryAdd: publicWidget.registry.websiteSlidesCategoryAdd }; - -}); diff --git a/addons/website_slides/static/src/js/slides_category_delete.js b/addons/website_slides/static/src/js/slides_category_delete.js index 58b75c3bd50..235b8b6ecf3 100644 --- a/addons/website_slides/static/src/js/slides_category_delete.js +++ b/addons/website_slides/static/src/js/slides_category_delete.js @@ -1,10 +1,8 @@ -odoo.define('website_slides.category.delete', function (require) { -'use strict'; +/** @odoo-module **/ -const publicWidget = require('web.public.widget'); -const Dialog = require('web.Dialog'); -const core = require('web.core'); -const _t = core._t; +import publicWidget from 'web.public.widget'; +import Dialog from 'web.Dialog'; +import { _t } from 'web.core'; const categoryDeleteDialog = Dialog.extend({ template: 'slides.category.delete', @@ -71,9 +69,7 @@ publicWidget.registry.websiteSlidesCategoryDelete = publicWidget.Widget.extend({ }, }); -return { +export default { categoryDeleteDialog: categoryDeleteDialog, websiteSlidesCategoryDelete: publicWidget.registry.websiteSlidesCategoryDelete }; - -}); diff --git a/addons/website_slides/static/src/js/slides_course_enroll_email.js b/addons/website_slides/static/src/js/slides_course_enroll_email.js index a9f5f799a79..4009c59ab7e 100644 --- a/addons/website_slides/static/src/js/slides_course_enroll_email.js +++ b/addons/website_slides/static/src/js/slides_course_enroll_email.js @@ -1,10 +1,8 @@ -odoo.define('website_slides.course.enroll', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var Dialog = require('web.Dialog'); -var publicWidget = require('web.public.widget'); -var _t = core._t; +import { _t } from 'web.core'; +import Dialog from 'web.Dialog'; +import publicWidget from 'web.public.widget'; var SlideEnrollDialog = Dialog.extend({ template: 'slide.course.join.request', @@ -75,9 +73,7 @@ publicWidget.registry.websiteSlidesEnroll = publicWidget.Widget.extend({ } }); -return { +export default { slideEnrollDialog: SlideEnrollDialog, websiteSlidesEnroll: publicWidget.registry.websiteSlidesEnroll }; - -}); diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js index 69bd01d2cf6..e8cad60594f 100644 --- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js +++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js @@ -1,22 +1,15 @@ +/** @odoo-module **/ + /* global YT */ -var onYouTubeIframeAPIReady = undefined; -odoo.define('website_slides.fullscreen', function (require) { - 'use strict'; + import publicWidget from 'web.public.widget'; + import { qweb as QWeb, _t } from 'web.core'; + import config from 'web.config'; - var publicWidget = require('web.public.widget'); - var core = require('web.core'); - var config = require('web.config'); - var QWeb = core.qweb; - var _t = core._t; - - var session = require('web.session'); - - var Quiz = require('website_slides.quiz').Quiz; - - var Dialog = require('web.Dialog'); - - require('website_slides.course.join.widget'); + import session from 'web.session'; + import { Quiz } from '@website_slides/js/slides_course_quiz'; + import Dialog from 'web.Dialog'; + import '@website_slides/js/slides_course_join'; /** * Helper: Get the slide dict matching the given criteria @@ -60,7 +53,7 @@ odoo.define('website_slides.fullscreen', function (require) { // function called when the Youtube asset is loaded // see https://developers.google.com/youtube/iframe_api_reference#Requirements - onYouTubeIframeAPIReady = function () { + window.onYouTubeIframeAPIReady = function () { resolve(); }; } else { @@ -759,5 +752,4 @@ odoo.define('website_slides.fullscreen', function (require) { }, }); - return Fullscreen; -}); + export default Fullscreen; diff --git a/addons/website_slides/static/src/js/slides_course_join.js b/addons/website_slides/static/src/js/slides_course_join.js index 0817f372c31..cd1dc7464fe 100644 --- a/addons/website_slides/static/src/js/slides_course_join.js +++ b/addons/website_slides/static/src/js/slides_course_join.js @@ -1,8 +1,7 @@ -odoo.define('website_slides.course.join.widget', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var publicWidget = require('web.public.widget'); +import core from 'web.core'; +import publicWidget from 'web.public.widget'; var _t = core._t; @@ -153,9 +152,7 @@ publicWidget.registry.websiteSlidesCourseJoin = publicWidget.Widget.extend({ }, }); -return { +export default { courseJoinWidget: CourseJoinWidget, websiteSlidesCourseJoin: publicWidget.registry.websiteSlidesCourseJoin }; - -}); diff --git a/addons/website_slides/static/src/js/slides_course_quiz.js b/addons/website_slides/static/src/js/slides_course_quiz.js index 96efa0c37f6..49bb52266da 100644 --- a/addons/website_slides/static/src/js/slides_course_quiz.js +++ b/addons/website_slides/static/src/js/slides_course_quiz.js @@ -1,20 +1,18 @@ -odoo.define('website_slides.quiz', function (require) { - 'use strict'; +/** @odoo-module **/ - var publicWidget = require('web.public.widget'); - var Dialog = require('web.Dialog'); - var core = require('web.core'); - var session = require('web.session'); - const {Markup} = require('web.utils'); + import publicWidget from 'web.public.widget'; + import Dialog from 'web.Dialog'; + import { qweb as QWeb, _t } from 'web.core'; + import session from 'web.session'; + import { Markup } from 'web.utils'; + import courseJoinWidget from '@website_slides/js/slides_course_join'; + import QuestionFormWidget from '@website_slides/js/slides_course_quiz_question_form'; + import SlideQuizFinishModal from '@website_slides/js/slides_course_quiz_finish'; - var CourseJoinWidget = require('website_slides.course.join.widget').courseJoinWidget; - var QuestionFormWidget = require('website_slides.quiz.question.form'); - var SlideQuizFinishModal = require('website_slides.quiz.finish'); + import slideEnrollDialog from '@website_slides/js/slides_course_enroll_email'; - var SlideEnrollDialog = require('website_slides.course.enroll').slideEnrollDialog; - - var QWeb = core.qweb; - var _t = core._t; + const { CourseJoinWidget } = courseJoinWidget; + const { SlideEnrollDialog } = slideEnrollDialog; /** * This widget is responsible of displaying quiz questions and propositions. Submitting the quiz will fetch the @@ -343,7 +341,7 @@ odoo.define('website_slides.quiz', function (require) { * * @private */ - async _submitQuiz() { + async _submitQuiz() { const data = await this._rpc({ route: '/slides/slide/quiz/submit', params: { @@ -772,9 +770,6 @@ odoo.define('website_slides.quiz', function (require) { }, }); - return { - Quiz: Quiz, - ConfirmationDialog: ConfirmationDialog, - websiteSlidesQuizNoFullscreen: publicWidget.registry.websiteSlidesQuizNoFullscreen - }; -}); + export var Quiz = Quiz; + export var ConfirmationDialog = ConfirmationDialog; + export const websiteSlidesQuizNoFullscree = publicWidget.registry.websiteSlidesQuizNoFullscreen; diff --git a/addons/website_slides/static/src/js/slides_course_quiz_finish.js b/addons/website_slides/static/src/js/slides_course_quiz_finish.js index 8d6d11e5658..f43729e1e40 100644 --- a/addons/website_slides/static/src/js/slides_course_quiz_finish.js +++ b/addons/website_slides/static/src/js/slides_course_quiz_finish.js @@ -1,9 +1,7 @@ -odoo.define('website_slides.quiz.finish', function (require) { -'use strict'; +/** @odoo-module **/ -var Dialog = require('web.Dialog'); -var core = require('web.core'); -var _t = core._t; +import Dialog from 'web.Dialog'; +import { _t } from 'web.core'; /** * This modal is used when the user finishes the quiz. @@ -152,6 +150,4 @@ var SlideQuizFinishModal = Dialog.extend({ }); -return SlideQuizFinishModal; - -}); +export default SlideQuizFinishModal; diff --git a/addons/website_slides/static/src/js/slides_course_quiz_question_form.js b/addons/website_slides/static/src/js/slides_course_quiz_question_form.js index 0fd43d43558..d2ab881db75 100644 --- a/addons/website_slides/static/src/js/slides_course_quiz_question_form.js +++ b/addons/website_slides/static/src/js/slides_course_quiz_question_form.js @@ -1,8 +1,7 @@ -odoo.define('website_slides.quiz.question.form', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var core = require('web.core'); +import publicWidget from 'web.public.widget'; +import core from 'web.core'; var QWeb = core.qweb; var _t = core._t; @@ -224,5 +223,4 @@ var QuestionFormWidget = publicWidget.Widget.extend({ }); -return QuestionFormWidget; -}); +export default QuestionFormWidget; diff --git a/addons/website_slides/static/src/js/slides_course_slides_list.js b/addons/website_slides/static/src/js/slides_course_slides_list.js index fa45200a2ed..a73fb9362c7 100644 --- a/addons/website_slides/static/src/js/slides_course_slides_list.js +++ b/addons/website_slides/static/src/js/slides_course_slides_list.js @@ -1,9 +1,7 @@ -odoo.define('website_slides.course.slides.list', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var core = require('web.core'); -var _t = core._t; +import publicWidget from 'web.public.widget'; +import { _t } from 'web.core'; publicWidget.registry.websiteSlidesCourseSlidesList = publicWidget.Widget.extend({ selector: '.o_wslides_slides_list', @@ -109,6 +107,4 @@ publicWidget.registry.websiteSlidesCourseSlidesList = publicWidget.Widget.extend } }); -return publicWidget.registry.websiteSlidesCourseSlidesList; - -}); +export default publicWidget.registry.websiteSlidesCourseSlidesList; diff --git a/addons/website_slides/static/src/js/slides_course_tag_add.js b/addons/website_slides/static/src/js/slides_course_tag_add.js index 9fbbbec502e..acd0d4904f2 100644 --- a/addons/website_slides/static/src/js/slides_course_tag_add.js +++ b/addons/website_slides/static/src/js/slides_course_tag_add.js @@ -1,11 +1,8 @@ -odoo.define('website_slides.channel_tag.add', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var Dialog = require('web.Dialog'); -var publicWidget = require('web.public.widget'); - -var _t = core._t; +import { _t } from 'web.core'; +import Dialog from 'web.Dialog'; +import publicWidget from 'web.public.widget'; var TagCourseDialog = Dialog.extend({ template: 'website.slides.tag.add', @@ -369,9 +366,7 @@ publicWidget.registry.websiteSlidesTag = publicWidget.Widget.extend({ }, }); -return { +export default { TagCourseDialog: TagCourseDialog, websiteSlidesTag: publicWidget.registry.websiteSlidesTag }; - -}); diff --git a/addons/website_slides/static/src/js/slides_course_unsubscribe.js b/addons/website_slides/static/src/js/slides_course_unsubscribe.js index ec0e104922a..866bf9d93c9 100644 --- a/addons/website_slides/static/src/js/slides_course_unsubscribe.js +++ b/addons/website_slides/static/src/js/slides_course_unsubscribe.js @@ -1,10 +1,9 @@ -odoo.define('website_slides.unsubscribe_modal', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var Dialog = require('web.Dialog'); -var publicWidget = require('web.public.widget'); -var utils = require('web.utils'); +import core from 'web.core'; +import Dialog from 'web.Dialog'; +import publicWidget from 'web.public.widget'; +import utils from 'web.utils'; var QWeb = core.qweb; var _t = core._t; @@ -160,9 +159,7 @@ publicWidget.registry.websiteSlidesUnsubscribe = publicWidget.Widget.extend({ }, }); -return { +export default { SlideUnsubscribeDialog: SlideUnsubscribeDialog, websiteSlidesUnsubscribe: publicWidget.registry.websiteSlidesUnsubscribe }; - -}); diff --git a/addons/website_slides/static/src/js/slides_share.js b/addons/website_slides/static/src/js/slides_share.js index c9942f79d07..2218af4c021 100644 --- a/addons/website_slides/static/src/js/slides_share.js +++ b/addons/website_slides/static/src/js/slides_share.js @@ -1,10 +1,8 @@ -odoo.define('website_slides.slides_share', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -require('website_slides.slides'); -var core = require('web.core'); -var _t = core._t; +import publicWidget from 'web.public.widget'; +import '@website_slides/js/slides'; +import { _t } from 'web.core'; var ShareMail = publicWidget.Widget.extend({ events: { @@ -102,4 +100,3 @@ publicWidget.registry.websiteSlidesShare = publicWidget.Widget.extend({ }) }, }); -}); diff --git a/addons/website_slides/static/src/js/slides_slide_archive.js b/addons/website_slides/static/src/js/slides_slide_archive.js index cccf2e0b801..42c77692b76 100644 --- a/addons/website_slides/static/src/js/slides_slide_archive.js +++ b/addons/website_slides/static/src/js/slides_slide_archive.js @@ -1,10 +1,8 @@ -odoo.define('website_slides.slide.archive', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var Dialog = require('web.Dialog'); -var core = require('web.core'); -var _t = core._t; +import publicWidget from 'web.public.widget'; +import Dialog from 'web.Dialog'; +import { _t } from 'web.core'; var SlideArchiveDialog = Dialog.extend({ template: 'slides.slide.archive', @@ -100,9 +98,7 @@ publicWidget.registry.websiteSlidesSlideArchive = publicWidget.Widget.extend({ }, }); -return { +export default { slideArchiveDialog: SlideArchiveDialog, websiteSlidesSlideArchive: publicWidget.registry.websiteSlidesSlideArchive }; - -}); diff --git a/addons/website_slides/static/src/js/slides_slide_like.js b/addons/website_slides/static/src/js/slides_slide_like.js index 88bc3db1b77..99ad4d4e937 100644 --- a/addons/website_slides/static/src/js/slides_slide_like.js +++ b/addons/website_slides/static/src/js/slides_slide_like.js @@ -1,11 +1,8 @@ -odoo.define('website_slides.slides.slide.like', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var publicWidget = require('web.public.widget'); -require('website_slides.slides'); - -var _t = core._t; +import { _t } from 'web.core'; +import publicWidget from 'web.public.widget'; +import '@website_slides/js/slides'; var SlideLikeWidget = publicWidget.Widget.extend({ events: { @@ -106,9 +103,7 @@ publicWidget.registry.websiteSlidesSlideLike = publicWidget.Widget.extend({ }, }); -return { +export default { slideLikeWidget: SlideLikeWidget, websiteSlidesSlideLike: publicWidget.registry.websiteSlidesSlideLike }; - -}); diff --git a/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js b/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js index 604170b646a..bcb5181ed7c 100644 --- a/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js +++ b/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js @@ -1,7 +1,6 @@ -odoo.define('website_slides.slide.preview', function (require) { - 'use strict'; +/** @odoo-module **/ - var publicWidget = require('web.public.widget'); + import publicWidget from 'web.public.widget'; publicWidget.registry.websiteSlidesSlideToggleIsPreview = publicWidget.Widget.extend({ selector: '.o_wslides_js_slide_toggle_is_preview', @@ -33,8 +32,6 @@ odoo.define('website_slides.slide.preview', function (require) { }, }); - return { + export default { websiteSlidesSlideToggleIsPreview: publicWidget.registry.websiteSlidesSlideToggleIsPreview }; - -}); diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js index f1921da916f..de60bf7fbf6 100644 --- a/addons/website_slides/static/src/js/slides_upload.js +++ b/addons/website_slides/static/src/js/slides_upload.js @@ -1,13 +1,9 @@ -odoo.define('website_slides.upload_modal', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var Dialog = require('web.Dialog'); -var publicWidget = require('web.public.widget'); -var utils = require('web.utils'); - -var QWeb = core.qweb; -var _t = core._t; +import { qweb as QWeb, _t } from 'web.core'; +import Dialog from 'web.Dialog'; +import publicWidget from 'web.public.widget'; +import utils from 'web.utils'; var SlideUploadDialog = Dialog.extend({ template: 'website.slide.upload.modal', @@ -670,9 +666,7 @@ publicWidget.registry.websiteSlidesUpload = publicWidget.Widget.extend({ }, }); -return { +export default { SlideUploadDialog: SlideUploadDialog, websiteSlidesUpload: publicWidget.registry.websiteSlidesUpload }; - -}); diff --git a/addons/website_slides/static/src/js/website_slides.editor.js b/addons/website_slides/static/src/js/website_slides.editor.js index 8ee780a2534..011a8aa0a79 100644 --- a/addons/website_slides/static/src/js/website_slides.editor.js +++ b/addons/website_slides/static/src/js/website_slides.editor.js @@ -1,15 +1,9 @@ -odoo.define('website_slides.editor', function (require) { -"use strict"; - -var core = require('web.core'); -var Dialog = require('web.Dialog'); -var QWeb = core.qweb; -var WebsiteNewMenu = require('website.newMenu'); -var TagCourseDialog = require('website_slides.channel_tag.add').TagCourseDialog; -var wUtils = require('website.utils'); - -var _t = core._t; +/** @odoo-module **/ +import { _t } from 'web.core'; +import Dialog from 'web.Dialog'; +import WebsiteNewMenu from 'website.newMenu'; +import { TagCourseDialog }from '@website_slides/js/slides_course_tag_add'; var ChannelCreateDialog = Dialog.extend({ template: 'website.slide.channel.create', @@ -185,4 +179,3 @@ WebsiteNewMenu.include({ return def; }, }); -}); diff --git a/addons/website_slides/static/src/tests/tours/slides_course_member.js b/addons/website_slides/static/src/tests/tours/slides_course_member.js index 5ab7e4d461d..bd506a40988 100644 --- a/addons/website_slides/static/src/tests/tours/slides_course_member.js +++ b/addons/website_slides/static/src/tests/tours/slides_course_member.js @@ -1,7 +1,6 @@ -odoo.define('website_slides.tour.slide.course.member', function (require) { -'use strict'; +/** @odoo-module **/ -var tour = require('web_tour.tour'); +import tour from 'web_tour.tour'; /** * Global use case: @@ -140,5 +139,3 @@ tour.register('course_member', { run: function () {}, // check review is correctly added } ]); - -}); diff --git a/addons/website_slides/static/src/tests/tours/slides_course_member_yt.js b/addons/website_slides/static/src/tests/tours/slides_course_member_yt.js index b060384d10a..8982a72d414 100644 --- a/addons/website_slides/static/src/tests/tours/slides_course_member_yt.js +++ b/addons/website_slides/static/src/tests/tours/slides_course_member_yt.js @@ -1,8 +1,7 @@ -odoo.define('website_slides.tour.slide.course.member.youtube', function (require) { -'use strict'; +/** @odoo-module **/ -var tour = require('web_tour.tour'); -var FullScreen = require('website_slides.fullscreen'); +import tour from 'web_tour.tour'; +import FullScreen from '@website_slides/js/slides_course_fullscreen_player'; /** * Alter this method for test purposes. @@ -63,5 +62,3 @@ tour.register('course_member_youtube', { trigger: 'a:contains("Back to course")' } ]); - -}); diff --git a/addons/website_slides/static/src/tests/tours/slides_course_publisher.js b/addons/website_slides/static/src/tests/tours/slides_course_publisher.js index 98cca8579c1..e65791673cc 100644 --- a/addons/website_slides/static/src/tests/tours/slides_course_publisher.js +++ b/addons/website_slides/static/src/tests/tours/slides_course_publisher.js @@ -1,8 +1,7 @@ -odoo.define('website_slides.tour.slide.course.publisher', function (require) { -'use strict'; +/** @odoo-module **/ -var tour = require('web_tour.tour'); -var slidesTourTools = require('website_slides.tour.tools'); +import tour from 'web_tour.tour'; +import slidesTourTools from '@website_slides/tests/tours/slides_tour_tools'; /** * Global use case: @@ -92,5 +91,3 @@ tour.register('course_publisher', { // run: 'drag_and_drop div.o_wslides_slides_list_drag a.o_wslides_js_slide_section_add', // }] )); - -}); diff --git a/addons/website_slides/static/src/tests/tours/slides_full_screen_web_editor.js b/addons/website_slides/static/src/tests/tours/slides_full_screen_web_editor.js index 26aeafe0bfa..bc97aef11d8 100644 --- a/addons/website_slides/static/src/tests/tours/slides_full_screen_web_editor.js +++ b/addons/website_slides/static/src/tests/tours/slides_full_screen_web_editor.js @@ -1,7 +1,6 @@ -odoo.define('website_slides.tour.fullscreen.edition.publisher', function (require) { -'use strict'; +/** @odoo-module **/ -var tour = require('web_tour.tour'); +import tour from 'web_tour.tour'; /** * Global use case: @@ -35,5 +34,3 @@ tour.register('full_screen_web_editor', { trigger: 'body.editor_enable', run: function () {} // check the editor is automatically opened on the detailed view }]); - -}); diff --git a/addons/website_slides/static/src/tests/tours/slides_tour_tools.js b/addons/website_slides/static/src/tests/tours/slides_tour_tools.js index 5b5f525cfeb..1b891a9a476 100644 --- a/addons/website_slides/static/src/tests/tours/slides_tour_tools.js +++ b/addons/website_slides/static/src/tests/tours/slides_tour_tools.js @@ -1,5 +1,4 @@ -odoo.define('website_slides.tour.tools', function (require) { -'use strict'; +/** @odoo-module **/ /* * PUBLISHER / CONTENT CREATION @@ -130,12 +129,10 @@ var addNewCourseTag = function (courseTagName) { }]; }; -return { +export default { addSection: addSection, addVideoToSection: addVideoToSection, addWebPageToSection: addWebPageToSection, addExistingCourseTag: addExistingCourseTag, addNewCourseTag: addNewCourseTag, }; - -}); diff --git a/addons/website_slides_survey/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides_survey/static/src/js/slides_course_fullscreen_player.js index 07277be6c57..0f1c9da26a1 100644 --- a/addons/website_slides_survey/static/src/js/slides_course_fullscreen_player.js +++ b/addons/website_slides_survey/static/src/js/slides_course_fullscreen_player.js @@ -3,7 +3,7 @@ odoo.define('website_slides_survey.fullscreen', function (require) { var core = require('web.core'); var QWeb = core.qweb; -var Fullscreen = require('website_slides.fullscreen'); +var Fullscreen = require('@website_slides/js/slides_course_fullscreen_player')[Symbol.for("default")]; Fullscreen.include({ xmlDependencies: (Fullscreen.prototype.xmlDependencies || []).concat( diff --git a/addons/website_slides_survey/static/src/js/slides_upload.js b/addons/website_slides_survey/static/src/js/slides_upload.js index 54dc18da723..d6a88f780e9 100644 --- a/addons/website_slides_survey/static/src/js/slides_upload.js +++ b/addons/website_slides_survey/static/src/js/slides_upload.js @@ -4,7 +4,7 @@ odoo.define('website_slides_survey.upload_modal', function (require) { var core = require('web.core'); var _t = core._t; var sessionStorage = window.sessionStorage; -var SlidesUpload = require('website_slides.upload_modal'); +var SlidesUpload = require('@website_slides/js/slides_upload')[Symbol.for("default")]; /** * Management of the new 'certification' slide_type