From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 2 Feb 2015 16:48:38 +0000 (+0100)
Subject: Fixed some minor issues
X-Git-Tag: 2.1.0_Beta_4~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ffe0bf1cdfa6b8e7237bec80a97f91df349cf82;p=GitHub%2FWoltLab%2FWCF.git

Fixed some minor issues
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index cfe2210959..0f309e8cb8 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -586,7 +586,10 @@ RedactorPlugins.wbbcode = function() {
 			
 			// drop newline between [/list] and [*]
 			html = html.replace(/\[\/list\]\n\[\*\]/g, '[/list][*]');
-			console.debug(html);
+			
+			// drop newline between two [/list]
+			html = html.replace(/\[\/list\]\n\[\/list\]/g, '[/list][/list]');
+			
 			// [table]
 			html = html.replace(/<table[^>]*>/gi, '[table]\n');
 			html = html.replace(/<\/table>/gi, '[/table]\n');
diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
index 746c82006d..89d12fbb05 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
@@ -189,7 +189,7 @@ RedactorPlugins.wmonkeypatch = function() {
 						}
 						else {
 							var $height = $element.outerHeight() + (parseInt($element.css('margin-bottom'), 10) || 0);
-							if ((event.pageY <= $offset.top + $height) || (index + 1) === $elements.length) {
+							if (event.pageY <= $offset.top + $height) {
 								$setCaretBeforeOrAfter(element, false);
 								
 								return false;