From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 27 Jan 2015 00:07:39 +0000 (+0100)
Subject: Improved readability in BBCode mode for lists
X-Git-Tag: 2.1.0_Beta_4~46
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24850b5e3868720ffbfa9357cd5e26c83da372b7;p=GitHub%2FWoltLab%2FWCF.git

Improved readability in BBCode mode for lists
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 026592f074..617e20e115 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -573,7 +573,7 @@ RedactorPlugins.wbbcode = function() {
 			
 			// [*]
 			html = html.replace(/<li>/gi, '[*]');
-			html = html.replace(/<\/li>/gi, '');
+			html = html.replace(/<\/li>/gi, '\n');
 			
 			// [list]
 			html = html.replace(/<ul>/gi, '[list]');
@@ -581,6 +581,12 @@ RedactorPlugins.wbbcode = function() {
 			html = html.replace(/<ul style="list-style-type: (none|circle|square|disc|decimal|lower-roman|upper-roman|decimal-leading-zero|lower-greek|lower-latin|upper-latin|armenian|georgian)">/gi, '[list=$1]');
 			html = html.replace(/<\/(ul|ol)>/gi, '[/list]');
 			
+			// ensure there is a newline in front of a [list]
+			html = html.replace(/\n?\[list\]/g, '\n[list]');
+			
+			// drop newline between [/list] and [*]
+			html = html.replace(/\[\/list\]\n\[\*\]/g, '[/list][*]');
+			console.debug(html);
 			// [table]
 			html = html.replace(/<table[^>]*>/gi, '[table]\n');
 			html = html.replace(/<\/table>/gi, '[/table]\n');
@@ -809,7 +815,12 @@ RedactorPlugins.wbbcode = function() {
 			data = data.replace(/\[align=(left|right|center|justify)\]([\s\S]*?)\[\/align\]/gi,'<div style="text-align: $1">$2</div>');
 			
 			// [*]
-			data = data.replace(/\[\*\]([\s\S]*?)(?=\[\*\]|\[\/list\])/gi,'<li>$1</li>');
+			data = data.replace(/\[\*\]([\s\S]*?)(?=\[\*\]|\[\/list\])/gi, function(match, content) {
+				return '<li>' + $.trim(content) + '</li>';
+			});
+			
+			// fix superflous newlines with nested lists
+			data = data.replace(/\n*(\[list\]<\/li>)/g, '$1');
 			
 			// [list]
 			data = data.replace(/\[list\]/gi, '<ul>');