From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 14 Aug 2015 13:02:21 +0000 (+0200)
Subject: Fixed internal editor selection not updated after clicking
X-Git-Tag: 2.1.7~32
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98609f38e810d02e4998d35bed9ea6485599b0a9;p=GitHub%2FWoltLab%2FWCF.git

Fixed internal editor selection not updated after clicking
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index b228996d8b..fb0bad1d7d 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -150,13 +150,13 @@ RedactorPlugins.wbbcode = function() {
 			
 			// insert a new line if user clicked into the editor and the last children is a quote (same behavior as arrow down)
 			this.wutil.setOption('clickCallback', (function(event) {
-				this.wutil.saveSelection();
-				
 				if (event.target === this.$editor[0]) {
 					if (this.$editor[0].lastElementChild && this.$editor[0].lastElementChild.tagName === 'BLOCKQUOTE') {
 						this.wutil.setCaretAfter($(this.$editor[0].lastElementChild));
 					}
 				}
+				
+				setTimeout(this.wutil.saveSelection.bind(this), 10);
 			}).bind(this));
 			
 			// drop ul to prevent being touched by this.clean.clearUnverifiedRemove()
@@ -212,6 +212,8 @@ RedactorPlugins.wbbcode = function() {
 			}
 			
 			if (this.opts.visual) {
+				this.wutil.restoreSelection();
+				
 				var $parentBefore = null;
 				if (window.getSelection().rangeCount && window.getSelection().getRangeAt(0).collapsed) {
 					$parentBefore = window.getSelection().getRangeAt(0).startContainer;
@@ -268,6 +270,8 @@ RedactorPlugins.wbbcode = function() {
 						$parent.insertBefore($node, $smiley.nextSibling);
 					}
 				}
+				
+				this.wutil.saveSelection();
 			}
 			else {
 				this.wutil.insertAtCaret(' ' + smileyCode + ' ');