Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: cb41ba99ce2c04ab70128bb8625f7647c24cd6f6 https://github.com/xwiki/xwiki-platform/commit/cb41ba99ce2c04ab70128bb8625f… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-01-26 (Fri, 26 Jan 2024) 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-webjar/src/main/webjar/editor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/transformers.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-21817: Removing all content from the realtime wysiwyg editor prevents coeditors from editing * Rebase the local changes that are filtered out during synchronization using a dedicated operational transformation that drops local changes that fall inside a remote delete operation. * Add functional test to prove the fix. * Small bulletproofing of editor.js * Small cleanup of wysiwygEditor.js * Fix RichTextAreaElement page object that was performing actions on the active element which is not necessarily the BODY element but some nested editable area (e.g. when a macro is editable in-line). * Add a method to RichTextAreaElement to wait for some plain text (the existing waitUntilContentContains can match HTML attributes or comments like macro markers, which is not what we want). (cherry picked from commit 9c50bff5e16f9f9f28960c9481c49c365dace24d)