From 920cffdd960d3423378272364e3071c29df59e6e Mon Sep 17 00:00:00 2001 From: Antoine Guenet Date: Fri, 24 Jun 2022 06:59:38 +0000 Subject: [PATCH] [MOV] web_editor, knowledge, mass_mailing, website: editor lib to src Odoo-Editor, having originally been developed with the purpose of being a standalone library, was put into a `lib` folder. Since in the meantime the library plans were aborted and since its presence outside the `src` directory makes translations unavailable for it, this moves the editor to `src/js/editor/odoo-editor`. task-2880723 Part-of: odoo/odoo#94516 --- .../src/js/knowledge_clipboard_whitelist.js | 2 +- addons/knowledge/static/src/js/wysiwyg.js | 2 +- addons/mass_mailing/static/src/js/wysiwyg.js | 2 +- addons/web_editor/__manifest__.py | 40 +++++++++--------- .../static/src/js/backend/convert_inline.js | 2 +- .../static/src/js/backend/field_html.js | 2 +- .../js/editor}/odoo-editor/README.md | 8 ++-- .../js/editor}/odoo-editor/_prettierignore | 0 .../js/editor}/odoo-editor/_prettierrc.js | 0 .../js/editor}/odoo-editor/demo/favicon.ico | Bin .../js/editor}/odoo-editor/demo/index.html | 0 .../js/editor}/odoo-editor/demo/main.js | 0 .../js/editor}/odoo-editor/src/OdooEditor.js | 0 .../js/editor}/odoo-editor/src/base_style.css | 0 .../js/editor}/odoo-editor/src/checklist.css | 0 .../editor}/odoo-editor/src/commands/align.js | 0 .../odoo-editor/src/commands/commands.js | 0 .../src/commands/deleteBackward.js | 0 .../odoo-editor/src/commands/deleteForward.js | 0 .../editor}/odoo-editor/src/commands/enter.js | 0 .../odoo-editor/src/commands/shiftEnter.js | 0 .../odoo-editor/src/commands/shiftTab.js | 0 .../editor}/odoo-editor/src/commands/tab.js | 0 .../odoo-editor/src/commands/toggleList.js | 0 .../odoo-editor/src/powerbox/Powerbox.js | 0 .../odoo-editor/src/powerbox/patienceDiff.js | 0 .../js/editor}/odoo-editor/src/qweb_sample.js | 0 .../js/editor}/odoo-editor/src/style.css | 0 .../src/tablepicker/TablePicker.js | 0 .../odoo-editor/src/utils/DOMPurify.js | 0 .../odoo-editor/src/utils/constants.js | 0 .../editor}/odoo-editor/src/utils/sanitize.js | 0 .../odoo-editor/src/utils/serialize.js | 0 .../js/editor}/odoo-editor/src/utils/utils.js | 0 .../editor}/odoo-editor/test/editor-test.html | 0 .../editor}/odoo-editor/test/editor-test.js | 0 .../js/editor}/odoo-editor/test/lib/chai.js | 0 .../js/editor}/odoo-editor/test/lib/mocha.css | 0 .../js/editor}/odoo-editor/test/lib/mocha.js | 0 .../odoo-editor/test/spec/align.test.js | 0 .../odoo-editor/test/spec/autostep.test.js | 0 .../odoo-editor/test/spec/collab.test.js | 0 .../odoo-editor/test/spec/color.test.js | 0 .../odoo-editor/test/spec/copyPaste.test.js | 0 .../odoo-editor/test/spec/editor.test.js | 0 .../odoo-editor/test/spec/fontAwesome.test.js | 0 .../odoo-editor/test/spec/fontSize.test.js | 0 .../odoo-editor/test/spec/format.test.js | 0 .../odoo-editor/test/spec/insertHTML.test.js | 0 .../odoo-editor/test/spec/link.test.js | 0 .../odoo-editor/test/spec/list.test.js | 0 .../odoo-editor/test/spec/urlRegex.test.js | 0 .../odoo-editor/test/spec/utils.test.js | 0 .../js/editor}/odoo-editor/test/utils.js | 0 .../static/src/js/wysiwyg/widgets/link.js | 2 +- .../static/src/js/wysiwyg/wysiwyg.js | 2 +- addons/web_editor/static/tests/test_utils.js | 2 +- addons/web_editor/tests/test_odoo_editor.py | 2 +- .../static/src/js/editor/snippets.editor.js | 2 +- 59 files changed, 34 insertions(+), 34 deletions(-) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/README.md (65%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/_prettierignore (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/_prettierrc.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/demo/favicon.ico (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/demo/index.html (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/demo/main.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/OdooEditor.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/base_style.css (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/checklist.css (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/align.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/commands.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/deleteBackward.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/deleteForward.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/enter.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/shiftEnter.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/shiftTab.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/tab.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/commands/toggleList.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/powerbox/Powerbox.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/powerbox/patienceDiff.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/qweb_sample.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/style.css (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/tablepicker/TablePicker.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/utils/DOMPurify.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/utils/constants.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/utils/sanitize.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/utils/serialize.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/src/utils/utils.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/editor-test.html (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/editor-test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/lib/chai.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/lib/mocha.css (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/lib/mocha.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/align.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/autostep.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/collab.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/color.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/copyPaste.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/editor.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/fontAwesome.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/fontSize.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/format.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/insertHTML.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/link.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/list.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/urlRegex.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/spec/utils.test.js (100%) rename addons/web_editor/static/{lib => src/js/editor}/odoo-editor/test/utils.js (100%) diff --git a/addons/knowledge/static/src/js/knowledge_clipboard_whitelist.js b/addons/knowledge/static/src/js/knowledge_clipboard_whitelist.js index eecb70e1a47..7c05efc18ce 100644 --- a/addons/knowledge/static/src/js/knowledge_clipboard_whitelist.js +++ b/addons/knowledge/static/src/js/knowledge_clipboard_whitelist.js @@ -1,6 +1,6 @@ /** @odoo-module */ -import { CLIPBOARD_WHITELISTS } from '@web_editor/../lib/odoo-editor/src/OdooEditor'; +import { CLIPBOARD_WHITELISTS } from '@web_editor/js/editor/odoo-editor/src/OdooEditor'; /** * Allow @see o_knowledge_ classes to be preserved in the editor on paste. diff --git a/addons/knowledge/static/src/js/wysiwyg.js b/addons/knowledge/static/src/js/wysiwyg.js index f2f582e4c3b..d1e918a02fa 100644 --- a/addons/knowledge/static/src/js/wysiwyg.js +++ b/addons/knowledge/static/src/js/wysiwyg.js @@ -3,7 +3,7 @@ import { qweb as QWeb } from 'web.core'; import Wysiwyg from 'web_editor.wysiwyg'; import { KnowledgeArticleLinkModal } from './wysiwyg/knowledge_article_link.js'; -import { preserveCursor, setCursorStart } from '@web_editor/../lib/odoo-editor/src/OdooEditor'; +import { preserveCursor, setCursorStart } from '@web_editor/js/editor/odoo-editor/src/OdooEditor'; Wysiwyg.include({ /** diff --git a/addons/mass_mailing/static/src/js/wysiwyg.js b/addons/mass_mailing/static/src/js/wysiwyg.js index 4fd836b9a3c..40efa7e7dfa 100644 --- a/addons/mass_mailing/static/src/js/wysiwyg.js +++ b/addons/mass_mailing/static/src/js/wysiwyg.js @@ -3,7 +3,7 @@ odoo.define('mass_mailing.wysiwyg', function (require) { var Wysiwyg = require('web_editor.wysiwyg'); var MassMailingSnippetsMenu = require('mass_mailing.snippets.editor'); -const {closestElement} = require('@web_editor/../lib/odoo-editor/src/OdooEditor'); +const {closestElement} = require('@web_editor/js/editor/odoo-editor/src/OdooEditor'); const MassMailingWysiwyg = Wysiwyg.extend({ //-------------------------------------------------------------------------- diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index 39fafb71eb4..124feadcb19 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -37,24 +37,24 @@ Odoo Web Editor widget. 'web_editor/static/lib/html2canvas.js', # needed for convert_inline.js # odoo-editor - 'web_editor/static/lib/odoo-editor/src/style.css', - 'web_editor/static/lib/odoo-editor/src/OdooEditor.js', - 'web_editor/static/lib/odoo-editor/src/utils/constants.js', - 'web_editor/static/lib/odoo-editor/src/utils/sanitize.js', - 'web_editor/static/lib/odoo-editor/src/utils/serialize.js', - 'web_editor/static/lib/odoo-editor/src/utils/DOMPurify.js', - 'web_editor/static/lib/odoo-editor/src/tablepicker/TablePicker.js', - 'web_editor/static/lib/odoo-editor/src/powerbox/patienceDiff.js', - 'web_editor/static/lib/odoo-editor/src/powerbox/Powerbox.js', - 'web_editor/static/lib/odoo-editor/src/commands/align.js', - 'web_editor/static/lib/odoo-editor/src/commands/commands.js', - 'web_editor/static/lib/odoo-editor/src/commands/deleteBackward.js', - 'web_editor/static/lib/odoo-editor/src/commands/deleteForward.js', - 'web_editor/static/lib/odoo-editor/src/commands/enter.js', - 'web_editor/static/lib/odoo-editor/src/commands/shiftEnter.js', - 'web_editor/static/lib/odoo-editor/src/commands/shiftTab.js', - 'web_editor/static/lib/odoo-editor/src/commands/tab.js', - 'web_editor/static/lib/odoo-editor/src/commands/toggleList.js', + 'web_editor/static/src/js/editor/odoo-editor/src/style.css', + 'web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js', + 'web_editor/static/src/js/editor/odoo-editor/src/utils/constants.js', + 'web_editor/static/src/js/editor/odoo-editor/src/utils/sanitize.js', + 'web_editor/static/src/js/editor/odoo-editor/src/utils/serialize.js', + 'web_editor/static/src/js/editor/odoo-editor/src/utils/DOMPurify.js', + 'web_editor/static/src/js/editor/odoo-editor/src/tablepicker/TablePicker.js', + 'web_editor/static/src/js/editor/odoo-editor/src/powerbox/patienceDiff.js', + 'web_editor/static/src/js/editor/odoo-editor/src/powerbox/Powerbox.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/align.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/enter.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/shiftEnter.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/shiftTab.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/tab.js', + 'web_editor/static/src/js/editor/odoo-editor/src/commands/toggleList.js', # utils 'web_editor/static/src/js/wysiwyg/linkDialogCommand.js', @@ -98,10 +98,10 @@ Odoo Web Editor widget. 'web_editor/static/src/components/upload_progress_toast/*.scss', ], 'web.assets_common': [ - 'web_editor/static/lib/odoo-editor/src/base_style.css', + 'web_editor/static/src/js/editor/odoo-editor/src/base_style.css', 'web_editor/static/lib/vkbeautify/**/*', 'web_editor/static/src/js/common/**/*', - 'web_editor/static/lib/odoo-editor/src/utils/utils.js', + 'web_editor/static/src/js/editor/odoo-editor/src/utils/utils.js', 'web_editor/static/src/js/wysiwyg/fonts.js', ], 'web.assets_backend': [ diff --git a/addons/web_editor/static/src/js/backend/convert_inline.js b/addons/web_editor/static/src/js/backend/convert_inline.js index fe2089ecee4..5706077dfba 100644 --- a/addons/web_editor/static/src/js/backend/convert_inline.js +++ b/addons/web_editor/static/src/js/backend/convert_inline.js @@ -2,7 +2,7 @@ 'use strict'; import FieldHtml from 'web_editor.field.html'; -import { isBlock, rgbToHex } from '../../../lib/odoo-editor/src/utils/utils'; +import { isBlock, rgbToHex } from '../editor/odoo-editor/src/utils/utils'; /* global html2canvas */ //-------------------------------------------------------------------------- diff --git a/addons/web_editor/static/src/js/backend/field_html.js b/addons/web_editor/static/src/js/backend/field_html.js index c3c9e2d13fd..2ed796da3da 100644 --- a/addons/web_editor/static/src/js/backend/field_html.js +++ b/addons/web_editor/static/src/js/backend/field_html.js @@ -7,7 +7,7 @@ import core from 'web.core'; import wysiwygLoader from 'web_editor.loader'; import field_registry from 'web.field_registry'; import {QWebPlugin} from '@web_editor/js/backend/QWebPlugin'; -import {getAdjacentPreviousSiblings, getAdjacentNextSiblings} from '../../../lib/odoo-editor/src/utils/utils'; +import {getAdjacentPreviousSiblings, getAdjacentNextSiblings} from '../editor/odoo-editor/src/utils/utils'; // must wait for web/ to add the default html widget, otherwise it would override the web_editor one import 'web._field_registry'; import "@web/views/fields/text/text_field"; // make sure the text field file has first been executed. diff --git a/addons/web_editor/static/lib/odoo-editor/README.md b/addons/web_editor/static/src/js/editor/odoo-editor/README.md similarity index 65% rename from addons/web_editor/static/lib/odoo-editor/README.md rename to addons/web_editor/static/src/js/editor/odoo-editor/README.md index 42d55ce0149..0509cdecc2e 100644 --- a/addons/web_editor/static/lib/odoo-editor/README.md +++ b/addons/web_editor/static/src/js/editor/odoo-editor/README.md @@ -13,18 +13,18 @@ be merged with another one. ## Demo To open the demo page: -`http:///web_editor/static/lib/odoo-editor/demo/index.html` +`http:///web_editor/static/src/js/editor/odoo-editor/demo/index.html` ## Tests To open the test page, go to -`http:///web_editor/static/lib/odoo-editor/test/editor-test.html` +`http:///web_editor/static/src/js/editor/odoo-editor/test/editor-test.html` ## Prettify ```bash # install prettier npm install -g prettier # prettify -prettier --config '/addons/web_editor/static/lib/odoo-editor/_prettierrc.js' --ignore-path='/odoo/addons/web_editor/static/lib/odoo-editor/_prettierignore' '/odoo/addons/web_editor/static/lib/odoo-editor/**/*.js' --write +prettier --config '/addons/web_editor/static/src/js/editor/odoo-editor/_prettierrc.js' --ignore-path='/odoo/addons/web_editor/static/src/js/editor/odoo-editor/_prettierignore' '/odoo/addons/web_editor/static/src/js/editor/odoo-editor/**/*.js' --write ``` ## Prettify with vscode @@ -33,7 +33,7 @@ Install vscode extention `esbenp.prettier-vscode`. Add the following configuration in your vscode user config or workspace config: ``` "prettier.requireConfig": true, -"prettier.configPath": "/odoo/addons/web_editor/static/lib/odoo-editor/.prettierrc.js", +"prettier.configPath": "/odoo/addons/web_editor/static/src/js/editor/odoo-editor/.prettierrc.js", "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" } diff --git a/addons/web_editor/static/lib/odoo-editor/_prettierignore b/addons/web_editor/static/src/js/editor/odoo-editor/_prettierignore similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/_prettierignore rename to addons/web_editor/static/src/js/editor/odoo-editor/_prettierignore diff --git a/addons/web_editor/static/lib/odoo-editor/_prettierrc.js b/addons/web_editor/static/src/js/editor/odoo-editor/_prettierrc.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/_prettierrc.js rename to addons/web_editor/static/src/js/editor/odoo-editor/_prettierrc.js diff --git a/addons/web_editor/static/lib/odoo-editor/demo/favicon.ico b/addons/web_editor/static/src/js/editor/odoo-editor/demo/favicon.ico similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/demo/favicon.ico rename to addons/web_editor/static/src/js/editor/odoo-editor/demo/favicon.ico diff --git a/addons/web_editor/static/lib/odoo-editor/demo/index.html b/addons/web_editor/static/src/js/editor/odoo-editor/demo/index.html similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/demo/index.html rename to addons/web_editor/static/src/js/editor/odoo-editor/demo/index.html diff --git a/addons/web_editor/static/lib/odoo-editor/demo/main.js b/addons/web_editor/static/src/js/editor/odoo-editor/demo/main.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/demo/main.js rename to addons/web_editor/static/src/js/editor/odoo-editor/demo/main.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/OdooEditor.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/OdooEditor.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/base_style.css b/addons/web_editor/static/src/js/editor/odoo-editor/src/base_style.css similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/base_style.css rename to addons/web_editor/static/src/js/editor/odoo-editor/src/base_style.css diff --git a/addons/web_editor/static/lib/odoo-editor/src/checklist.css b/addons/web_editor/static/src/js/editor/odoo-editor/src/checklist.css similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/checklist.css rename to addons/web_editor/static/src/js/editor/odoo-editor/src/checklist.css diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/align.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/align.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/align.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/align.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/commands.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/commands.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/deleteBackward.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/deleteBackward.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/deleteForward.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/deleteForward.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/enter.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/enter.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/enter.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/enter.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/shiftEnter.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/shiftEnter.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/shiftEnter.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/shiftEnter.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/shiftTab.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/shiftTab.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/shiftTab.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/shiftTab.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/tab.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/tab.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/tab.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/tab.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/commands/toggleList.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/toggleList.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/commands/toggleList.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/commands/toggleList.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/powerbox/Powerbox.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/powerbox/Powerbox.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/powerbox/Powerbox.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/powerbox/Powerbox.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/powerbox/patienceDiff.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/powerbox/patienceDiff.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/powerbox/patienceDiff.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/powerbox/patienceDiff.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/qweb_sample.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/qweb_sample.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/qweb_sample.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/qweb_sample.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/style.css b/addons/web_editor/static/src/js/editor/odoo-editor/src/style.css similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/style.css rename to addons/web_editor/static/src/js/editor/odoo-editor/src/style.css diff --git a/addons/web_editor/static/lib/odoo-editor/src/tablepicker/TablePicker.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/tablepicker/TablePicker.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/tablepicker/TablePicker.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/tablepicker/TablePicker.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/DOMPurify.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/utils/DOMPurify.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/utils/DOMPurify.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/utils/DOMPurify.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/constants.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/utils/constants.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/utils/constants.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/utils/constants.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/utils/sanitize.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/utils/sanitize.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/serialize.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/utils/serialize.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/utils/serialize.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/utils/serialize.js diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/utils.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/utils/utils.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/src/utils/utils.js rename to addons/web_editor/static/src/js/editor/odoo-editor/src/utils/utils.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/editor-test.html b/addons/web_editor/static/src/js/editor/odoo-editor/test/editor-test.html similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/editor-test.html rename to addons/web_editor/static/src/js/editor/odoo-editor/test/editor-test.html diff --git a/addons/web_editor/static/lib/odoo-editor/test/editor-test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/editor-test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/editor-test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/editor-test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/lib/chai.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/lib/chai.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/lib/chai.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/lib/chai.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/lib/mocha.css b/addons/web_editor/static/src/js/editor/odoo-editor/test/lib/mocha.css similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/lib/mocha.css rename to addons/web_editor/static/src/js/editor/odoo-editor/test/lib/mocha.css diff --git a/addons/web_editor/static/lib/odoo-editor/test/lib/mocha.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/lib/mocha.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/lib/mocha.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/lib/mocha.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/align.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/align.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/align.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/align.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/autostep.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/autostep.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/autostep.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/autostep.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/collab.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/collab.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/collab.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/collab.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/color.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/color.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/color.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/color.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/copyPaste.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/copyPaste.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/editor.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/editor.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/fontAwesome.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/fontAwesome.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/fontAwesome.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/fontAwesome.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/fontSize.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/fontSize.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/fontSize.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/fontSize.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/format.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/format.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/format.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/format.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/insertHTML.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/insertHTML.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/insertHTML.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/insertHTML.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/link.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/link.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/link.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/link.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/list.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/list.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/list.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/list.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/urlRegex.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/urlRegex.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/urlRegex.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/urlRegex.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/spec/utils.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/utils.test.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/spec/utils.test.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/spec/utils.test.js diff --git a/addons/web_editor/static/lib/odoo-editor/test/utils.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/utils.js similarity index 100% rename from addons/web_editor/static/lib/odoo-editor/test/utils.js rename to addons/web_editor/static/src/js/editor/odoo-editor/test/utils.js diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link.js index 0e41c44de9d..56ee3dc3e30 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/link.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link.js @@ -2,7 +2,7 @@ odoo.define('wysiwyg.widgets.Link', function (require) { 'use strict'; const core = require('web.core'); -const OdooEditorLib = require('@web_editor/../lib/odoo-editor/src/OdooEditor'); +const OdooEditorLib = require('@web_editor/js/editor/odoo-editor/src/OdooEditor'); const Widget = require('web.Widget'); const {isColorGradient} = require('web_editor.utils'); diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js index e99258fa5f3..9902f78a46a 100644 --- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js +++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js @@ -16,7 +16,7 @@ const {compatibilityColorNames} = require('web_editor.ColorPalette'); const concurrency = require('web.concurrency'); const { device } = require('web.config'); const { localization } = require('@web/core/l10n/localization'); -const OdooEditorLib = require('@web_editor/../lib/odoo-editor/src/OdooEditor'); +const OdooEditorLib = require('@web_editor/js/editor/odoo-editor/src/OdooEditor'); const snippetsEditor = require('web_editor.snippet.editor'); const Toolbar = require('web_editor.toolbar'); const weWidgets = require('wysiwyg.widgets'); diff --git a/addons/web_editor/static/tests/test_utils.js b/addons/web_editor/static/tests/test_utils.js index 4d29bacab54..4ea6ce0cea1 100644 --- a/addons/web_editor/static/tests/test_utils.js +++ b/addons/web_editor/static/tests/test_utils.js @@ -4,7 +4,7 @@ odoo.define('web_editor.test_utils', function (require) { var ajax = require('web.ajax'); var MockServer = require('web.MockServer'); var testUtils = require('web.test_utils'); -var OdooEditorLib = require('@web_editor/../lib/odoo-editor/src/OdooEditor'); +var OdooEditorLib = require('@web_editor/js/editor/odoo-editor/src/OdooEditor'); var Widget = require('web.Widget'); var Wysiwyg = require('web_editor.wysiwyg'); var options = require('web_editor.snippets.options'); diff --git a/addons/web_editor/tests/test_odoo_editor.py b/addons/web_editor/tests/test_odoo_editor.py index c9da12eb82b..5997f99e9c5 100644 --- a/addons/web_editor/tests/test_odoo_editor.py +++ b/addons/web_editor/tests/test_odoo_editor.py @@ -7,4 +7,4 @@ import odoo.tests class TestOdooEditor(odoo.tests.HttpCase): def test_odoo_editor_suite(self): - self.browser_js('/web_editor/static/lib/odoo-editor/test/editor-test.html', "", "", timeout=1800) + self.browser_js('/web_editor/static/src/js/editor/odoo-editor/test/editor-test.html', "", "", timeout=1800) diff --git a/addons/website/static/src/js/editor/snippets.editor.js b/addons/website/static/src/js/editor/snippets.editor.js index c2016be4277..70fd1ba517b 100644 --- a/addons/website/static/src/js/editor/snippets.editor.js +++ b/addons/website/static/src/js/editor/snippets.editor.js @@ -5,7 +5,7 @@ const {qweb, _t, _lt} = require('web.core'); const Dialog = require('web.Dialog'); const weSnippetEditor = require('web_editor.snippet.editor'); const wSnippetOptions = require('website.editor.snippets.options'); -const OdooEditorLib = require('@web_editor/../lib/odoo-editor/src/utils/utils'); +const OdooEditorLib = require('@web_editor/js/editor/odoo-editor/src/utils/utils'); const getDeepRange = OdooEditorLib.getDeepRange; const getTraversedNodes = OdooEditorLib.getTraversedNodes;