XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's...
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
Showing
- xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js 98 additions, 72 deletions...m-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js
- 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 11 additions, 3 deletions...main/java/org/xwiki/edit/test/po/InplaceEditablePage.java
- xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml 17 additions, 0 deletions...tform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml
- xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources.properties 5 additions, 1 deletion...ux-api/src/main/resources/ApplicationResources.properties
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/messages.js 0 additions, 1 deletion...wiki-platform-realtime-webjar/src/main/webjar/messages.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js 434 additions, 337 deletions...e/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js 4 additions, 11 deletions...atform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js
- 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 11 additions, 1 deletion...iki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js 4 additions, 9 deletions...-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
- xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/actionbuttons/actionButtons.js 5 additions, 2 deletions.../webapp/resources/js/xwiki/actionbuttons/actionButtons.js
- xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/meta.js 54 additions, 52 deletions...atform-web-war/src/main/webapp/resources/js/xwiki/meta.js
Loading