From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 5 Sep 2016 12:42:30 +0000 (+0200)
Subject: Improved caret position before/after blocks
X-Git-Tag: 3.0.0_Beta_1~300
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3295323cd54f0b21c2868c1dad16f7e928f7938;p=GitHub%2FWoltLab%2FWCF.git

Improved caret position before/after blocks
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js
index b108e5108b..6b00feb703 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js
@@ -140,10 +140,6 @@ $.Redactor.prototype.WoltLabCaret = function() {
 		},
 		
 		_handleEditorClick: function (event) {
-			if (event.target !== this.$editor[0]) {
-				return;
-			}
-			
 			if (!this.selection.get().isCollapsed) {
 				return;
 			}
@@ -153,6 +149,16 @@ $.Redactor.prototype.WoltLabCaret = function() {
 				return;
 			}
 			
+			// get block element that received the click
+			var targetBlock = event.target;
+			while (targetBlock && !this.utils.isBlockTag(targetBlock.nodeName)) {
+				targetBlock = targetBlock.parentNode;
+			}
+			
+			if (!targetBlock || targetBlock === block) {
+				return;
+			}
+			
 			if (block.nodeName === 'P') {
 				block = block.parentNode;
 				if (block === this.$editor[0] || !this.utils.isBlockTag(block.nodeName)) {
@@ -171,12 +177,37 @@ $.Redactor.prototype.WoltLabCaret = function() {
 				return;
 			}
 			
-			// click occurred onto the empty editor space, but before or after a block element
-			var insertBefore = (event.clientY < block.getBoundingClientRect().top);
+			// handle nested blocks
+			var insertBefore, rect;
+			var parent = block;
+			while (parent) {
+				rect = parent.getBoundingClientRect();
+				
+				if (event.clientY < rect.top) {
+					insertBefore = true;
+					block = parent;
+				}
+				else if (event.clientY > rect.bottom) {
+					insertBefore = false;
+					block = parent;
+				}
+				else {
+					break;
+				}
+				
+				if (parent.parentNode && parent.parentNode !== this.$editor[0]) {
+					parent = parent.parentNode;
+				}
+				else {
+					break;
+				}
+			}
 			
 			// check if there is already a paragraph in place
 			var sibling = block[(insertBefore ? 'previous' : 'next') + 'ElementSibling'];
 			if (sibling && sibling.nodeName === 'P') {
+				this.caret.end(sibling);
+				
 				return;
 			}