[xwiki-notifications] [xwiki/xwiki-platform] 859150: XWIKI-22351: The autosave triggers a merge conflic...

Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 859150471ed7d4d6be892aec8ea4006b2d80a713 https://github.com/xwiki/xwiki-platform/commit/859150471ed7d4d6be892aec8ea4… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-04 (Fri, 04 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/src/main/java/org/xwiki/edit/test/po/InplaceEditablePage.java M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml 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-webjar/src/main/webjar/messages.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/wikiEditor.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/RealtimeWYSIWYGEditorIT.java 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/js/xwiki/actionbuttons/actionButtons.js M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/meta.js Log Message: ----------- XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's no save done outside the realtime session * When replacing empty paragraphs with empty lines, take into account the CKEditor temporary elements (like the hidden selection) when determining if an empty paragraph is at the start / end of the edited content, otherwise we get conflicts in the realtime session (e.g. because the widget selection is not synchronized and so some users will have the hidden selection element while others won't) * Disable the action buttons while an action takes place (e.g. saving) in order to avoid triggering the same action multiple times * Rewrite the realtime auto-saver to improve the synchronization between clients when saving or handling merge conflicts (cherry picked from commit 62264aed58e3756d15649cafd4aface92a43c38e) Commit: 7bdc3fa9434c57a0cfb4437d628d876572b00b00 https://github.com/xwiki/xwiki-platform/commit/7bdc3fa9434c57a0cfb4437d628d… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-04 (Fri, 04 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.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/RealtimeWYSIWYGEditorIT.java Log Message: ----------- XWIKI-22224: Sometimes when the automatically Saved is done the Menu bar dissapears (cherry picked from commit eb581d422a84220099d734172032b0b4dd305003) Compare: https://github.com/xwiki/xwiki-platform/compare/53e75e8abe1e...7bdc3fa9434c To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications