Fixed setting caret after block element

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 00ed92391cfd967b81b5968b41285faa34ad5cbc..42db80b1c8a121fdc6794bb5a26bbaea8e1edc65 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -13,6 +13,7 @@
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabAutosave.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabBlock.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabButton.js?v={@LAST_UPDATE_TIME}',
+                       '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabCaret.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabCode.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabColor.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabDropdown.js?v={@LAST_UPDATE_TIME}',
@@ -152,6 +153,7 @@
                                        'WoltLabAlignment',
                                        'WoltLabAttachment',
                                        'WoltLabAutosave',
+                                       'WoltLabCaret',
                                        'WoltLabCode',
                                        'WoltLabColor',
                                        'WoltLabDropdown',

diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 00ed92391cfd967b81b5968b41285faa34ad5cbc..42db80b1c8a121fdc6794bb5a26bbaea8e1edc65 100644 (file)
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -13,6 +13,7 @@
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabAutosave.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabBlock.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabButton.js?v={@LAST_UPDATE_TIME}',
+                       '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabCaret.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabCode.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabColor.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabDropdown.js?v={@LAST_UPDATE_TIME}',
@@ -152,6 +153,7 @@
                                        'WoltLabAlignment',
                                        'WoltLabAttachment',
                                        'WoltLabAutosave',
+                                       'WoltLabCaret',
                                        'WoltLabCode',
                                        'WoltLabColor',
                                        'WoltLabDropdown',

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js
new file mode 100644 (file)
index 0000000..6c96331
--- /dev/null
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js
@@ -0,0 +1,30 @@
+$.Redactor.prototype.WoltLabCaret = function() {
+       "use strict";
+       
+       return {
+               init: function () {
+                       var mpAfter = this.caret.after;
+                       this.caret.after = (function (node) {
+                               node = this.caret.prepare(node);
+                               
+                               if (this.utils.isBlockTag(node.tagName)) {
+                                       this.WoltLabCaret._addParagraphAfterBlock(node);
+                               }
+                               
+                               mpAfter.call(this, node);
+                       }).bind(this);
+               },
+               
+               _addParagraphAfterBlock: function (block) {
+                       var nextElement = block.nextElementSibling;
+                       if (nextElement && (nextElement.nodeName === 'P' || this.utils.isBlockTag(nextElement.nodeName))) {
+                               // valid target
+                               return;
+                       }
+                       
+                       nextElement = elCreate('p');
+                       nextElement.textContent = '\u200B';
+                       block.parentNode.insertBefore(nextElement, block.nextSibling);
+               }
+       };
+};