[xwiki-notifications] [xwiki/xwiki-platform] 6faf9c: XWIKI-22077: Merge conflict when adding content af...

Branch: refs/heads/stable-16.4.x Home: https://github.com/xwiki/xwiki-platform Commit: 6faf9c8d4dacc91e225dee585cf1a641659d8b10 https://github.com/xwiki/xwiki-platform/commit/6faf9c8d4dacc91e225dee585cf1… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-08 (Tue, 08 Oct 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 Log Message: ----------- XWIKI-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration * Add a functional test to prove the issue is fixed. (cherry picked from commit eebf3d83da42f045640a424f3883a22b010708a5) Commit: 37b794aa7e0f3ef12a92ee4a2cf4a6435d9007b6 https://github.com/xwiki/xwiki-platform/commit/37b794aa7e0f3ef12a92ee4a2cf4… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-08 (Tue, 08 Oct 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 Log Message: ----------- XWIKI-22551: Information box content lost when multiple users update the macro parameters at the same time * Wait for the editor to be ready before focusing it when coming back from the macro wizard. * Mark the editor ready after the event loop (i.e. with a slight delay) and double check that it's ready * Update widget selection after restoring the selection as a result of a remote change (cherry picked from commit b65623c8486aac3dd291d42b449c1e01bbc64a25) Compare: https://github.com/xwiki/xwiki-platform/compare/b23c98264d5b...37b794aa7e0f To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications