From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 14 Dec 2014 01:44:14 +0000 (+0100)
Subject: Fixed quotes being wrapped inside <p /> which causes unwanted space
X-Git-Tag: 2.1.0_Beta_1~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c43e4173940a7831cdc9cc3d418df73615ddcb83;p=GitHub%2FWoltLab%2FWCF.git

Fixed quotes being wrapped inside <p /> which causes unwanted space
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index e89b6c581c..6294a6cb78 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1010,6 +1010,11 @@ RedactorPlugins.wbbcode = function() {
 				}
 			}
 			
+			// remove <p> wrapping a quote
+			data = data.replace(/<p><blockquote/g, '<blockquote');
+			data = data.replace(/<\/blockquote><\/p>/g, '</blockquote>');
+			
+			console.debug(data);
 			WCF.System.Event.fireEvent('com.woltlab.wcf.redactor', 'afterConvertToHtml', { data: data });
 			
 			return data;
@@ -1592,6 +1597,11 @@ RedactorPlugins.wbbcode = function() {
 					$tagName = 'DIV';
 				}
 				
+				console.debug(referenceElement);
+				console.debug(target);
+				console.debug(referenceElement[target]);
+				console.debug("");
+				
 				// no previous/next element or it is not a <p> (default) or <div> (within quotes)
 				if (referenceElement[target] === null || referenceElement[target].tagName !== $tagName) {
 					$('<' + $tagName + '>' + this.opts.invisibleSpace + '</' + $tagName + '>')[(target === 'previousElementSibling' ? 'insertBefore' : 'insertAfter')](referenceElement);