From 9e8651d5e2c475de4e9173383c8b96c533fba110 Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Wed, 20 Dec 2023 15:30:16 +0100 Subject: [PATCH] [FIX] web, test_lint: regroup bootstrap globals A later commit will add `Offcanvas` as new bootstrap global in the eslintrc files. Since the globals are randomly sorted, the chance is taken to regroup those. Part-of: odoo/odoo#146907 --- addons/web/tooling/_eslintrc.json | 15 ++++++++------- odoo/addons/test_lint/tests/eslintrc | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/addons/web/tooling/_eslintrc.json b/addons/web/tooling/_eslintrc.json index f34d28a8fb0..92f7c655619 100644 --- a/addons/web/tooling/_eslintrc.json +++ b/addons/web/tooling/_eslintrc.json @@ -42,24 +42,25 @@ "jQuery": "readonly", "Chart": "readonly", "fuzzy": "readonly", - "Popover": "readonly", "StackTrace": "readonly", "QUnit": "readonly", "luxon": "readonly", "py": "readonly", "FullCalendar": "readonly", "globalThis": "readonly", - "Modal": "readonly", - "Dropdown": "readonly", "ScrollSpy": "readonly", - "Tooltip": "readonly", - "Collapse": "readonly", - "Alert": "readonly", "module": "readonly", "chai": "readonly", "describe": "readonly", "it": "readonly", "mocha": "readonly", - "DOMPurify": "readonly" + "DOMPurify": "readonly", + + "Alert": "readonly", + "Collapse": "readonly", + "Dropdown": "readonly", + "Modal": "readonly", + "Popover": "readonly", + "Tooltip": "readonly" } } diff --git a/odoo/addons/test_lint/tests/eslintrc b/odoo/addons/test_lint/tests/eslintrc index 9831628e2db..5df943b9430 100644 --- a/odoo/addons/test_lint/tests/eslintrc +++ b/odoo/addons/test_lint/tests/eslintrc @@ -28,24 +28,25 @@ "jQuery": "readonly", "Chart": "readonly", "fuzzy": "readonly", - "Popover": "readonly", "StackTrace": "readonly", "QUnit": "readonly", "luxon": "readonly", "py": "readonly", "FullCalendar": "readonly", - "Modal": "readonly", - "Dropdown": "readonly", "ScrollSpy": "readonly", - "Tooltip": "readonly", - "Collapse": "readonly", - "Alert": "readonly", "globalThis": "readonly", "module": "readonly", "chai": "readonly", "describe": "readonly", "it": "readonly", "mocha": "readonly", - "DOMPurify": "readonly" + "DOMPurify": "readonly", + + "Alert": "readonly", + "Collapse": "readonly", + "Dropdown": "readonly", + "Modal": "readonly", + "Popover": "readonly", + "Tooltip": "readonly" } }