Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: fb7465ced48c59755239dd683060d4c90f69bdfe https://github.com/xwiki/xwiki-platform/commit/fb7465ced48c59755239dd683060d... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/cursor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/typingTests.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/src/main/resources/XWiki/Realtime/WysiwygEditor.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/filters.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/loader.js A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-20052: Repeated errors in the console logs when using the WYSIWYG editor * Extract the code that filters the HyperJSON and the diff changes in a separate module so that it's easier to keep them in sync. * Don't sync BODY attributes because they hold user preferences which can be different for different users. XWIKI-20053: It is not possible to edit wiki macro contents while another editor is typing in a realtime session * Extend the filters module to support macros that are editable in-place. * Preserve the selection using our 'xwiki-selection' CKEditor plugin (that is already used by the non-realtime editor) instead of the cursor module (which is based on Rangy library) * Restore the selection only when the caret or selection end points are inside a modified DOM node (as shown by the diff). We don't need to do anything otherwise because the browser can update the selection if DiffDOM makes changes in other parts of the DOM. XWIKI-21007: Content in editor widgets is flickering when typing on the other side of the collaborative session * Don't destroy an re-create all widgets. Initialize only the new widgets we receive. XWIKI-20673: Action button events are not triggered properly by the realtime editor XWIKI-21401: Content from Realtime Editing session aren't stored in the page content after it has finished * Don't remove the existing save listeners. Instead, listen to beforeSave and stop the save, do our stuff and then retrigger the save using the save button. (cherry picked from commit 0ae0b93b5d245900ca52be27f292c24e6b5c352f) Commit: bffd6bbc45b8edee046edbae04472dc2ddc86e32 https://github.com/xwiki/xwiki-platform/commit/bffd6bbc45b8edee046edbae04472... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- [misc] Fix some SonarLint reported issues. (cherry picked from commit 6056969c55cd00fb7415410e9af03f55f57c212a) Commit: 5b6007c43c7303d32b68b5dfe5e5d7be07bdf01a https://github.com/xwiki/xwiki-platform/commit/5b6007c43c7303d32b68b5dfe5e5d... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/WYSIWYGEditorAdministrationSectionPage.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java M xwiki-platform-core/xwiki-platform-realtime/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AllIT.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditor.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml M xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/src/main/resources/XWiki/DefaultWYSIWYGEditorConfig.xml Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * Initial test setup, just to have the realtime editor loaded in tests. (cherry picked from commit 82a80fdcb9968392738364c43a13be2c1417d404) Commit: b646b33583cbb28b134352af4083daefc6588b85 https://github.com/xwiki/xwiki-platform/commit/b646b33583cbb28b134352af4083d... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/editor/EditPage.java Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * Progress on the Page Objects and functional tests (cherry picked from commit ecaffe992703940badc538d1a1b3e9758b436da8) Commit: 14d6db6ce9f90c1da038b49fa8aeb509452a9a9f https://github.com/xwiki/xwiki-platform/commit/14d6db6ce9f90c1da038b49fa8aeb... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/editor/PreviewableEditPage.java Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * Fix failing test (cherry picked from commit 2447fc623f3ce166ed64ea296844019500f7b986) Commit: 916a0a5f6966c358866e2f8280f2cf412bf3c3ab https://github.com/xwiki/xwiki-platform/commit/916a0a5f6966c358866e2f8280f2c... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AbstractRealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * Add one more test. (cherry picked from commit 87c58c0972f59d2828d0fec8784c00042ca1e868) Commit: c8964f43f17ebf264cdde92ae09ad4da83ae70e1 https://github.com/xwiki/xwiki-platform/commit/c8964f43f17ebf264cdde92ae09ad... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AllIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * One more test, plus fix page objects. (cherry picked from commit 61a93ea8591e8e8a3d9ce784e5f622dac5e7f201) Commit: 5375dd71623cf266a8caab9bb7674f283ef1a79e https://github.com/xwiki/xwiki-platform/commit/5375dd71623cf266a8caab9bb7674... Author: Marius Dumitru Florea <[email protected]> Date: 2023-10-30 (Mon, 30 Oct 2023) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml Log Message: ----------- XWIKI-21338: Add automated functional tests for the real-time WYSIWYG editor * Fix the version of new modules. Compare: https://github.com/xwiki/xwiki-platform/compare/397f18e2a2dd...5375dd71623c