Fixed handling of newline characters in tournament descriptions and other places where BBCode is handled or stripped`

Author: blackshadowshade

src/ui/js/Env.js

@@ -399,6 +399,8 @@ Env.applyBbCodeToHtml = function(htmlToParse) {
 
   var tagName;
 
+  htmlToParse = htmlToParse.replace('\n', '<br>');
+
   while (htmlToParse) {
     var currentPattern = allStartTagsPattern;
     if (tagStack.length !== 0) {
@@ -587,6 +589,8 @@ Env.removeBbCodeFromHtml = function(htmlToParse) {
 
   var tagName;
 
+  htmlToParse = htmlToParse.replace('\n', ' ');
+
   while (htmlToParse) {
     var currentPattern = allStartTagsPattern;
     if (tagStack.length !== 0) {
@@ -603,7 +607,7 @@ Env.removeBbCodeFromHtml = function(htmlToParse) {
     // to end at the first [/quote], not the second)
     currentPattern = '^(.*?)(?:' + currentPattern + ')(.*)$';
     // case-insensitive, multi-line
-    var regExp = new RegExp(currentPattern, 'im');
+    var regExp = new RegExp(currentPattern, 'ims');
 
     var match = htmlToParse.match(regExp);
     if (match) {

test/src/ui/js/test_Env.js

@@ -270,12 +270,24 @@ test("test_Env.applyBbCodeToHtml", function(assert) {
   holder.append(Env.applyBbCodeToHtml(rawHtml));
   assert.ok(holder.find('b').length == 1, '<b> tag *should* be allowed unmolested');
   assert.ok(holder.find('.chatItalic').length == 1, '[i] tag should be converted to HTML');
+
+  rawHtml = '[u]aaaa[/u]cc\ndd[u]bbbb[/u]';
+  var newHtml = Env.applyBbCodeToHtml(rawHtml);
+  assert.equal(
+    newHtml,
+    '<span class="chatUnderlined">aaaa</span>cc<br>dd<span class="chatUnderlined">bbbb</span>',
+    'New HTML should be correct'
+  );
 });
 
 test("test_Env.removeBbCodeFromHtml", function(assert) {
   var rawHtml = '<b>HTML</b><br/>[i]BB Code[/i]';
   var newHtml = Env.removeBbCodeFromHtml(rawHtml);
   assert.equal(newHtml, '<b>HTML</b><br/>BB Code', 'Stripped-down HTML should be correct');
+
+  rawHtml = '[u]aaaa[/u]cc\ndd[u]bbbb[/u]';
+  newHtml = Env.removeBbCodeFromHtml(rawHtml);
+  assert.equal(newHtml, 'aaaacc ddbbbb', 'Stripped-down HTML should be correct');
 });
 
 test("test_Env.escapeRegexp", function(assert) {