[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
This commit is contained in:
Antoine Guenet
2022-07-04 18:53:05 +02:00
parent d126f01e30
commit 920cffdd96
59 changed files with 34 additions and 34 deletions
@@ -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.
+1 -1
View File
@@ -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({
/**
+1 -1
View File
@@ -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({
//--------------------------------------------------------------------------
+20 -20
View File
@@ -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': [
@@ -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 */
//--------------------------------------------------------------------------
@@ -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.
@@ -13,18 +13,18 @@ be merged with another one.
## Demo
To open the demo page:
`http://<host:port>/web_editor/static/lib/odoo-editor/demo/index.html`
`http://<host:port>/web_editor/static/src/js/editor/odoo-editor/demo/index.html`
## Tests
To open the test page, go to
`http://<host:port>/web_editor/static/lib/odoo-editor/test/editor-test.html`
`http://<host:port>/web_editor/static/src/js/editor/odoo-editor/test/editor-test.html`
## Prettify
```bash
# install prettier
npm install -g prettier
# prettify
prettier --config '<odoo-path>/addons/web_editor/static/lib/odoo-editor/_prettierrc.js' --ignore-path='<odoo-path>/odoo/addons/web_editor/static/lib/odoo-editor/_prettierignore' '<odoo-path>/odoo/addons/web_editor/static/lib/odoo-editor/**/*.js' --write
prettier --config '<odoo-path>/addons/web_editor/static/src/js/editor/odoo-editor/_prettierrc.js' --ignore-path='<odoo-path>/odoo/addons/web_editor/static/src/js/editor/odoo-editor/_prettierignore' '<odoo-path>/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-path>/odoo/addons/web_editor/static/lib/odoo-editor/.prettierrc.js",
"prettier.configPath": "<odoo-path>/odoo/addons/web_editor/static/src/js/editor/odoo-editor/.prettierrc.js",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -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');
@@ -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');
+1 -1
View File
@@ -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');
+1 -1
View File
@@ -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)
@@ -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;