#636 Fix multiple issues with lists

GetLuna · Apr 4, 2014 · 0794e00 · 0794e00
1 parent 3d1640d
commit 0794e00
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/include/tinymce/plugins/bbcode/plugin.min.js b/include/tinymce/plugins/bbcode/plugin.min.js
@@ -187,6 +187,7 @@
 			rep(/\[\/\*\]/gi,"</li>");
 			rep(/\[list=a\]/gi,"<ol style=\"list-style-type: lower-alpha\">");
 			rep(/\[list=1\]/gi,"<ol>");
+			rep(/\[list]/gi,"<ul>");
 			rep(/\[list=\*\]/gi,"<ul>");
 			rep(/\[\/list\]/gi,"</ol>");
 			rep(/\[center\](.*?)\[\/center\]/gi,"<p style=\"text-align: center;\">$1</p>");
@@ -201,6 +202,16 @@
 			rep(/\[code\](.*?)\[\/code\]/gi,"<pre>$1</pre>&nbsp;");
 			rep(/\[c\](.*?)\[\/c\]/gi,"<code>$1</code>&nbsp;");
 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>&nbsp;");
+			rep(/<br \/>/gi,"\n");
+			rep(/<br\/>/gi,"\n");
+			rep(/<br>/gi,"\n");
+			rep(/<p>/gi,"");
+			rep(/<\/p>/gi,"\n");
+			rep(/&nbsp;|\u00a0/gi," ");
+			rep(/&quot;/gi,"\"");
+			rep(/&lt;/gi,"<");
+			rep(/&gt;/gi,">");
+			rep(/&amp;/gi,"&");
 			// Emoticons from BBCode to HTML
 			rep(/\:\)/gi,"<img src=\"img/smilies/smile.png\" />&nbsp;");
 			rep(/\=\)/gi,"<img src=\"img/smilies/smile.png\" />&nbsp;");