From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 26 Apr 2015 15:04:26 +0000 (+0200)
Subject: Reverted some changes
X-Git-Tag: 2.1.4~47^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1af618a49adf052a4fa901051c364e31dd4e00ac;p=GitHub%2FWoltLab%2FWCF.git

Reverted some changes
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 2d4263cc48..f87fd2eea2 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -958,20 +958,10 @@ RedactorPlugins.wbbcode = function() {
 			}
 			
 			// [*]
-			var $hasListItems = false;
 			data = data.replace(/\[\*\]([\s\S]*?)(?=\[\*\]|\[\/list\])/gi, function(match, content) {
-				$hasListItems = true;
-				
 				return '<li>' + $.trim(content) + '</li>';
 			});
 			
-			// fix expanded formatting for lists
-			if ($hasListItems) {
-				data = data.replace(/(<p style="[^"]+">)(\[list[^\]]*\])?<li>/g, '$2<li>$1');
-				data = data.replace(/(<p style="[^"]+">)<\/li><li>/g, '</li><li>$1');
-				data = data.replace(/(<\/li>\[\/list\])<\/p>/g, '$1');
-			}
-			
 			// fix superflous newlines with nested lists
 			data = data.replace(/\n*(\[list\]<\/li>)/g, '$1');
 			
@@ -1421,7 +1411,6 @@ RedactorPlugins.wbbcode = function() {
 						+ '</div>';
 					}).bind(this));
 					
-					//data = data.replace(new RegExp('(?:<p>)?(@@' + $cachedCode.key + '@@)(?:<\/p>)?', 'g'), '$1');
 					data = data.replace($regex, $value);
 				}
 			}