codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-05-02 08:54:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: BBCode with params couldn't span lines

Browse source
This commit is contained in:
Robin Ward 2014-08-22 12:14:10 -04:00
parent f422e5c8c4
commit 104b39540a
2 changed files with 4 additions and 1 deletions
app/assets/javascripts/discourse/dialects
bbcode_dialect.js
test/javascripts/lib
bbcode-test.js.es6

2
app/assets/javascripts/discourse/dialects/bbcode_dialect.js
View file

@ -47,7 +47,7 @@ function replaceBBCodeParamsRaw(tag, emitter) {
stop: "[/" + tag + "]", stop: "[/" + tag + "]",
rawContents: true, rawContents: true,
emitter: function(contents) { emitter: function(contents) {
var regexp = /^([^\]]+)\](.*)$/, var regexp = /^([^\]]+)\]([\S\s]*)$/,
m = regexp.exec(contents); m = regexp.exec(contents);
if (m) { return emitter.call(this, m[1], m[2]); } if (m) { return emitter.call(this, m[1], m[2]); }

3
test/javascripts/lib/bbcode-test.js.es6
View file

@ -62,6 +62,9 @@ test("size tags", function() {
format("[size=asdf]regular[/size]", format("[size=asdf]regular[/size]",
"<span class=\"bbcode-size-1\">regular</span>", "<span class=\"bbcode-size-1\">regular</span>",
"it only supports numbers in bbcode"); "it only supports numbers in bbcode");
format("[size=35]\nNEWLINE\n[/size]",
"<span class=\"bbcode-size-35\"><br>NEWLINE<br></span>",
"works with newlines");
}); });
test("quotes", function() { test("quotes", function() {