Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 75ccd52f7a268eba81f24e8ae11ac198651bcafc https://github.com/xwiki/xwiki-platform/commit/75ccd52f7a268eba81f24e8ae11a… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml A xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js A xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/src/main/webjar/config.js M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml 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-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/loader.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/src/main/resources/XWiki/Realtime/WysiwygEditor.xml 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/filters.js R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-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/patches.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.css M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-19157: Make the real-time WYSIWYG editor work in-place also XWIKI-19156: Bundle the real-time WYSIWYG editor in XWiki Standard * Move the code that depends on CKEditor from xwiki-platform-realtime-wysiwyg to xwiki-platform-ckeditor (the code left in xwiki-platform-realtime-wysiwyg should work, more or less, with any rich text editor) * Enable realtime editing as a CKEditor plugin (because it's easier to manage), rather than by defining a new editor ("Realtime CKEditor") * Move the user caret indicator styles to a CSS file and change the way styles are loaded in order to work with the in-place editor. * Change the name of the CKEditor instance used when editing in-place, from 'xwiki-content' to 'content', in order to be consistent with the standalone WYSIWYG edit mode and also because we're now using the CKEditor instance name to create the Netflux channel path and we want the in-place editor and the standalone editor to be part of the same real-time session. * Make the in-place editor set 'XWiki.editor' value to "wysiwyg" while we are editing, in case some JavaScript code is relying on this (like the real-time code which gets activated currently only when 'XWiki.editor' matches the real-time editor type). * Refactor the code that computes the Netflux channel paths to make it generic so that it works with any document field, not just the document content (preparing the ground for real-time forms). * Refactor and fix the autosave * Add support for having the in-place editor join the same real-time session as the standalone editor, by making the root of the HyperJSON we sync independent of the type of WYSIWYG editor (BODY vs. DIV). * Refactor the generic real-time WYSIWYG editing code to improve readability (cherry picked from commit 22be277d5bc90abea705688d50a4ce3b3defc90e) Commit: 79caf13d72b1af50fcae49496ae52d5d3bf56de1 https://github.com/xwiki/xwiki-platform/commit/79caf13d72b1af50fcae49496ae5… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml Log Message: ----------- XWIKI-21575: Real-time editing is using AGPL-licensed dependencies which is not compatible with XWiki's LGPL license * Update the version of dependencies for which the license was changed from AGPL to LGPL. (cherry picked from commit c2c70d5e2b9854831e0812fbc121d9ba408cf9e6) Commit: ad89290cfa189db588245d38e0a64b48632ec8e7 https://github.com/xwiki/xwiki-platform/commit/ad89290cfa189db588245d38e0a6… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/interface.js 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-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/loader.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.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-19157: Make the real-time WYSIWYG editor work in-place also * Don't duplicate the "Allow realtime" checkbox when editing again in-place (without reloading the page) * Leave and re-enter the realtime session without a page reload. * Small refactoring to group together connection related data (state), in order to cleanup more easily, and replace the initializing and aborted flags with a single (connection) state field. * Make sure the warning message displayed when there are offline editors (outside the realtime session) is updated when they enter the real-time session (without reloading the page). (cherry picked from commit 05318b9b0bbbacdff1095afcb79955ea3e393611) Commit: c8790f6834a4ee12ad267c4e344e368442489c0d https://github.com/xwiki/xwiki-platform/commit/c8790f6834a4ee12ad267c4e344e… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/plugin.js M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/javascript.vm 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 M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/lock/lock.js Log Message: ----------- XWIKI-19157: Make the real-time WYSIWYG editor work in-place also * Fix error thrown when the realtime editor tries to lock the current page from view mode (in-place editing). Declare the 'xwiki-document-lock' module to be able to load it in view mode on demand. * Enable realtime when re-entering in-place edit mode (without page reload), if the "Allow realtime collaboration" checkbox was checked when the user previosuly left the in-place edit mode. (cherry picked from commit 70d027fc25df287cba01f0f6e22b91d16cc072f3) Commit: 16e9642a8f5f23576544c716c59f43c0b0c66797 https://github.com/xwiki/xwiki-platform/commit/16e9642a8f5f23576544c716c59f… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) 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-webjar/src/main/webjar/userData.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.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-19157: Make the real-time WYSIWYG editor work in-place also * Refactor the Saver code for improved readability * Make sure all channels are properly closed when leaving the edit mode without reloading the page (for in-place editing). (cherry picked from commit f6ce75a1c86d3acd480cb86726ef522f975fb146) Commit: e0274e534cd7e9cc84b7956a42de9f9928866381 https://github.com/xwiki/xwiki-platform/commit/e0274e534cd7e9cc84b7956a42de… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ContentSheet.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/DefaultEntityChannelStore.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/script/NetfluxScriptServiceTest.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.css M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-19157: Make the real-time WYSIWYG editor work in-place also * Fix the user caret indicators in in-place edit mode. * Use a relative XPath to send the caret position because the root element is different between standalone and in-place edit mode. * Also bulletproof DefaultEntityChannelStore for multi-threading. (cherry picked from commit 96825a7ccad8881fe48f2f03a38faf0b2478b3eb) Commit: dcd16b7f0cd7821c88e7d05693525ef900703c80 https://github.com/xwiki/xwiki-platform/commit/dcd16b7f0cd7821c88e7d0569352… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/plugin.js 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-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/loader.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.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-19157: Make the real-time WYSIWYG editor work in-place also * Refactor loader.js to make it work with any document field, not just content, and to support leaving the edit mode without reloading the page (for in-place edit mode). * Broadcast a message on the events/all channel when someone stops editing a document field (e.g. when leaving in-place edit mode without reloading the page). * Properly remove the document saved listener when destroying the (auto) Saver without reloading the page. (cherry picked from commit 17cda1313b7c36dac807a9e71b0122e2af32cde0) Commit: 32c2ad87b373d31780a8d6df68427b1a1eed7497 https://github.com/xwiki/xwiki-platform/commit/32c2ad87b373d31780a8d6df6842… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml Log Message: ----------- XWIKI-19156: Bundle the real-time WYSIWYG editor in XWiki Standard * Make the realtime editing an optinal dependency (since it's disabled by default). (cherry picked from commit 1e91b0a434e6f946ba5294f2035ff27b04e4eb71) Commit: 50558cbb040f048ac2413ed9b77801f041be1080 https://github.com/xwiki/xwiki-platform/commit/50558cbb040f048ac2413ed9b778… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 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/CKEditorConfigurationPane.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 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/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-ui/pom.xml M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/BootstrapSelect.java Log Message: ----------- XWIKI-19156: Bundle the real-time WYSIWYG editor in XWiki Standard XWIKI-19157: Make the real-time WYSIWYG editor work in-place also * Update the functional tests (cherry picked from commit c2bc6b4252d4734c56c474a9fa572ef1105fbaaf) Commit: f9d421493a9b5c348511da67ba7a8403aa48e07d https://github.com/xwiki/xwiki-platform/commit/f9d421493a9b5c348511da67ba7a… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.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-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 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/RealtimeCKEditor.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-19157: Make the real-time WYSIWYG editor work in-place also * Update page objects and tests (cherry picked from commit 0822c0804dc80109b81fcea3aa52153b64070dc6) Commit: 0b036339552b1a6572ce521d5387042f3fefb0dd https://github.com/xwiki/xwiki-platform/commit/0b036339552b1a6572ce521d5387… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/QuickActionsIT.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-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-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/ui/AbstractCKEditorIT.java Log Message: ----------- XWIKI-19157: Make the real-time WYSIWYG editor work in-place also * Fix the functional tests failing on Chrome. (cherry picked from commit 2044edb31216affbab7d2d295645ad4607c12fbd) Commit: 07fb9958308c0d747a237ec204eb415bebd4736d https://github.com/xwiki/xwiki-platform/commit/07fb9958308c0d747a237ec204eb… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: 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/RealtimeCKEditor.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-19157: Make the real-time WYSIWYG editor work in-place also * Update the realtime functional tests. (cherry picked from commit 483cde273b4f9e668a75a68b9a36e7185e4a6555) Commit: 3264765cc88fe039deb1ae16d8919ead7232c98f https://github.com/xwiki/xwiki-platform/commit/3264765cc88fe039deb1ae16d891… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannel.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannelStore.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/EntityChannelTest.java Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Implement hashCode and equals for EntityChannel to be able to use it properly in hash-based collections. (cherry picked from commit 34777759063f2ab608fa37c8dc5546bf406464e8) Commit: 0de2ad7dc5fb6e578531602137528d5b15b05ef0 https://github.com/xwiki/xwiki-platform/commit/0de2ad7dc5fb6e57853160213752… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 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 Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Improve the RichTextAreaElement PO: ** When waiting for some HTML content or text we need to take into account that the editable content (including the root) can be reloaded, e.g. as a result of inserting or updating a macro (posibly from a remote change). ** I couldn't find a cross browser way to type text into the rich text area that reproduces the real user interaction, especially when dealing with nested editable areas (for in-line editable macros), so I had to write code specific to Firefox and Chrome. (cherry picked from commit c8ab554a281e3b6d3c6b1c9e87508af1faa87d0c) Commit: 4930660d10a5ac80973c4a420ffcc15bcb30d34b https://github.com/xwiki/xwiki-platform/commit/4930660d10a5ac80973c4a420ffc… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-selection/plugin.js Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Overwrite CKEditor#setReadOnly to better handle "nesting" (e.g. if two async processes make the editor read-only and then restore it, we want the restore to happen only after both processes trigger it). * Improve the xwiki-refresh command: ** Add a onceAfterRefresh helper that covers a recurring need to execute some code after a refresh command is executed. ** We should be able to execute the refresh command when the editor is read-only. Moreover, the refresh command doesn't need to focus the editor and it doesn't depend on the current selection. ** Add an option to the refresh command to skip preserving the selection (the code executing the refresh command may want to control how the selection is preserved). ** Notify the refresh is done only after the macro widgets are ready for user interaction. * Improve macro insertion: ** Wait for the editor to be ready before inserting a macro (e.g. if a refresh is currently being executed as a result of a remote change that inserted a new macro or modified the parameters of an exisiting one). ** Take into account that the widget for which we opened the Macro Edit Modal might not exist anymore after we submit the modal because the edited content has been refreshed in the mean time. If the selection was preserved we can try to find again the edited widget. ** Place the caret inside the first nested editable (that corresponds to a macro parameter or content), if the macro is editable inline, otherwise select the inserted macro. * The realtime editor needs to know when the editor is being locked/unlocked (i.e. in loading state). * Fix getOutputHTML to return only the edited content (without any wrapping), in order to have consistency between standalone and in-place edit mode. * Don't trigger change events (for realtime) when the editor is read-only (there may be some intermediary states that we don't wan to synchronize). * When the content is updated as a result of a remote change we need to detect if that change inserted a new macro or modified the parameters of an existing macro. If that is the case then we need to refresh the content. (cherry picked from commit b7ffa88566e3516b6bc6a55bfbfbb5dc9a85d4db) Commit: ade9e58b2832b26522cf95eacdf8c41aec0d3a4e https://github.com/xwiki/xwiki-platform/commit/ade9e58b2832b26522cf95eacdf8… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) 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-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/userData.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Make sure we use a single (same) WebSocket connection for all our channels (all events, content, saver, user data). * Make it possible to wait for the Saver and User Data connections to be ready. (cherry picked from commit 3822c3a2846d7d66ed97149cd5b05160e7376929) Commit: ee016ebe77eeb4b9a1c50fee9b9829260c2e34e8 https://github.com/xwiki/xwiki-platform/commit/ee016ebe77eeb4b9a1c50fee9b98… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: 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 M 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-21767: Dynamic macros are not properly synchronized * Make Editor#contentUpdated() async because it may trigger a content refresh (if macros are affected) in which case we need to be able to wait for the content to be rendered server-side. * Synchronize editors on the output HTML (what is sent to the server to be converted to wiki syntax). Everything that is not included in the output HTML (e.g. macro output for macros that are not editable inline, user state such as selected widget) is considered a local change that needs to be rebased on top of all received remote changes. * Make setHyperJSON async because it needs to wait for the content to be updated (e.g. server-side rendering in case of a macro change). * Detect if a remote change inserts a new macro or modifies the parameters of an existing macro * Drop content normalization (for now) and rely instead on rebasing local changes that are not shared. * Improve the rebase transformation to better preserve intention (logic) and to reduce the risk of getting invalid JSON as a result. * Wait for the Saver and User Data to be ready before allowing the user to type. * "Pause" the realtime sync while the editor is waiting for server-side rendering of macros, and then perform a merge before resuming the realtime sync. * Re-fetch the channel keys when re-joining the realtime session because the channels may have been closed in the mean time (if they were ever created). (cherry picked from commit 5cbc506a93c5ce73be8675aa9f488fcd62d03334) Commit: bd3833ce8a0fa64cc285e5c6e6f3f51733c947a8 https://github.com/xwiki/xwiki-platform/commit/bd3833ce8a0fa64cc285e5c6e6f3… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: 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/RealtimeWYSIWYGEditPage.java Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Update the existing functional tests. * Increase a bit the "error" margin for the auto-save timeout to avoid some rare test failure. * Proper wait for the realtime editor to be ready before starting typing. (cherry picked from commit acb7b8e3fdf7ad17f07cc55a22ecaa49202345f4) Commit: 0cbea69d333aa96156c9f3eb43e3de0bbdf5c5a5 https://github.com/xwiki/xwiki-platform/commit/0cbea69d333aa96156c9f3eb43e3… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/interface.js 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-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/userData.js 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/RealtimeTestDebugger.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 M 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-21767: Dynamic macros are not properly synchronized * Improve a bit the performance by reducing the number of local changes that need to be rebased when a remote change is received. * Fix console logging. (cherry picked from commit 5244301b002c37451dfd63d2724e48ebfbd10065) (cherry picked from commit 73a00106f9cf868cd42e4e2cf575898b60d98d96) Commit: 64c6ae6036052b51e4ddf56eb72ca8741429d33f https://github.com/xwiki/xwiki-platform/commit/64c6ae6036052b51e4ddf56eb72c… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js Log Message: ----------- XWIKI-21767: Dynamic macros are not properly synchronized * Fix two regressions introduced in previous commits (in-place editor starts readonly and the selection is not properly restored when the macro wizard is used). (cherry picked from commit 144c02bb61928312039b6d99e5414ce25e3ea7e1) (cherry picked from commit dc4c6e401a6134ff328d831afa081727f9c8161b) Commit: fa8d5c51bec8cbb12a67edda7d712aa176fc3fcd https://github.com/xwiki/xwiki-platform/commit/fa8d5c51bec8cbb12a67edda7d71… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/plugin.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * In order to reduce the number of local changes we need to synchronize on the editor output HTML (that is converted to wiki syntax) but for this we need to make sure the whitespace at the end of lines is preserved. (cherry picked from commit 08d1c93f581cf9573d8a6c915fb4afb1420070b2) Commit: 3d2d5b10a95b56bf4027ea50bab3a5fb2910776a https://github.com/xwiki/xwiki-platform/commit/3d2d5b10a95b56bf4027ea50bab3… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/macroEditor.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Simplify the editor HTML output by removing redundant content (the value of macro content and parameters that are editable in-place), in order to reduce the size of the diffed content and the number of local changes. (cherry picked from commit d3713253bca18306331c3d47e125cb2c7e4f7241) Commit: d97bb3e6b83ae4f9f5e3ee5389628c64ff6eac1e https://github.com/xwiki/xwiki-platform/commit/d97bb3e6b83ae4f9f5e3ee538962… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/textCursor.js Log Message: ----------- [misc] Simplify code and fix code style. (cherry picked from commit e77512670f751178dfc7572aa9f40b8a7b11162f) Commit: c33a938a887aba7aa544a14798b6ec723b97c199 https://github.com/xwiki/xwiki-platform/commit/c33a938a887aba7aa544a14798b6… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js Log Message: ----------- [misc] Remove unused dependencies. (cherry picked from commit c19f00a9717a2666a0cc1043c6b362803379aaf1) Commit: 80e840ed01d92c6013dc3095dfc4fcf86be75221 https://github.com/xwiki/xwiki-platform/commit/80e840ed01d92c6013dc3095dfc4… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: 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-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- [misc] Improve typing simulation used for debugging / testing realtime edit during development. (cherry picked from commit 0a3fb72abb5223501a18ba0f42dc269ba91e70c5) Commit: ac1d273e5aef944da867daa1f1335c3533899b97 https://github.com/xwiki/xwiki-platform/commit/ac1d273e5aef944da867daa1f133… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js R 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/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-22034: Realtime WYSIWYG editor is very slow even on medium size content * Synchronize using the editor output HTML (i.e. what is sent to the server to be converted to wiki syntax) in order to avoid dealing with local changes and also avoid applying complex (HyperJSON) filters to obtain the normalized content (the editor output HTML is the normalized content). * The editor output HTML can contain XML comments (annotations like macro markers) but HyperJSON doesn't support comments, so we need to protect/unprotect them when converting to/from HyperJSON. * Restoring the diff-based text selection is costly and is not needed most of the time (when users edit in different sections of the content) so we also save a "relative" selection that can be invalidated when applying the DOM patch (cherry picked from commit edbe5408b040f6e73a584d412aa7083d2eedffd6) Commit: 85c50ee7d4fd4854b676483bea159030f69b9bd1 https://github.com/xwiki/xwiki-platform/commit/85c50ee7d4fd4854b676483bea15… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/src/main/resources/XWiki/Realtime/WysiwygEditor.xml Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * The filters module has been removed (because it's not needed anymore) (cherry picked from commit 5ed57a30e371591d1dbd38c2f34fedc492bf5e74) Commit: 04589086156dcea06ac16c70963357996c9ddb99 https://github.com/xwiki/xwiki-platform/commit/04589086156dcea06ac16c709633… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 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/CKEditor.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/MacroDialogEditModal.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/RealtimeCKEditor.java Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Wait for macros to be rendered after inserting or editing a macro. * Verify that applying remote changes doesn't steal the focus from the Edit Macro modal. (cherry picked from commit c5443ebe99f9b2b9b7beade548d4aa6b5b2d3111) Commit: 6185e27cebd687d34bde1ed14adc4507f58b83ca https://github.com/xwiki/xwiki-platform/commit/6185e27cebd687d34bde1ed14adc… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Save snapshot before and after patching the DOM, in order to be able to undo/redo a remote change * Prevent the editor for recording undo/redo history entries while we patch and reload the content (in case a macro was modified) * Make sure the editor doesn't fire change events while we patch and reload the content * When diffing the DOM ignore the widget (e.g. macro) output and use instead only the widget data. We do this by replacing the widgets with some custom HTML elements and then revert (restore the widget output) after the patch is applied. * Don't use the native selection because the editor might not be focused (in fact the editor loses the focus whenever we switch the browser tab/window, which happens a lot in functional tests). Use instead the selection that the editor saves (remembers from the last time is had the focus). (cherry picked from commit d066580cafd1e9a1affed2de1d668023f90a476a) Commit: 9fc5a10064324ee33a529f004c116036bf4588b3 https://github.com/xwiki/xwiki-platform/commit/9fc5a10064324ee33a529f004c11… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-selection/plugin.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Improve selection restore code to: ** not steal the focus when remote changes are applied ** take into account only the visible text (and focusable elements) when encoding the text selection in order to avoid unexpected results when performing the diff ** better scroll into view focused / selected widgets * Also allow changes on the root node if the change affects its children (i.e. change.node is actually the parent of the changed nodes) (cherry picked from commit 0f5ff7ea2d173b246b85b2baf90f77abcacc53ae) Commit: 606f666eab214c1a3aa0093c8ab8ff334448cff3 https://github.com/xwiki/xwiki-platform/commit/606f666eab214c1a3aa0093c8ab8… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-selection/plugin.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Preserve the selection direction (e.g. when using Shift + Arrow Left to select text and a remote change is applied) (cherry picked from commit d933cd4168577b6002147c1d42b22a6325b76ff4) Commit: 381c62bb02870b861da4e0f5042d9cdb9187fe7f https://github.com/xwiki/xwiki-platform/commit/381c62bb02870b861da4e0f5042d… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js Log Message: ----------- XWIKI-22034: Realtime WYSIWYG editor is very slow even on medium size content * Properly initialize the new nested editables after a remote change is applied in order to prevent adding them multiple times. * Re-render the macros when a new nested editable is added for a macro widget. (cherry picked from commit fa1c0bb344a442d0945233c2d4ffdfd7f5ccfd78) Commit: a7706fecafd0ec1e3fee2434e74ee068fb093620 https://github.com/xwiki/xwiki-platform/commit/a7706fecafd0ec1e3fee2434e74e… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources.properties 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-ui/src/main/resources/XWiki/Realtime/ConfigurationClass.xml R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Translations.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js Log Message: ----------- XWIKI-22079: Nothing changes when unselecting the "SHOW EDITING USERS" * Enable the hints (and make them translatable) to remove confusion about the realtime configuration options * Code cleanup and bulletproofing (cherry picked from commit 15a3982f429f24db129f5edb3c88bde55e3ae8da) Commit: a831e16b54fe2b726bb37ba69d236a11465da367 https://github.com/xwiki/xwiki-platform/commit/a831e16b54fe2b726bb37ba69d23… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/interface.js Log Message: ----------- XWIKI-22078: Realtime Collaboration is active when editing again the page where it was unchecked * Make sure the "Allow realtime collaboration" checkbox reflects the state of realtime editing. (cherry picked from commit 9e27de2ddd2669dd892d6882b8b764cc21f5e637) Commit: beb82c6d34a5f53f1beb3b4ddd2ead3c053ec045 https://github.com/xwiki/xwiki-platform/commit/beb82c6d34a5f53f1beb3b4ddd2e… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/src/test/it/org/xwiki/realtime/wiki/test/ui/RealtimeWikiEditorIT.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/src/main/java/org/xwiki/realtime/wiki/test/po/RealtimeWikiEditPage.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/src/main/java/org/xwiki/realtime/wiki/test/po/RealtimeWikiEditor.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/po/editor/WikiEditPage.java Log Message: ----------- XWIKI-22112: RealtimeWikiEditorIT.toggleRealtimeWithSelf (cherry picked from commit b01436025ba2a7504d7456880e6710a618358418) Compare: https://github.com/xwiki/xwiki-platform/compare/7632b5e6b811...beb82c6d34a5 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications