github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 03:48:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: BBCode was trimming leading space in [code] blocks

Browse Source
This commit is contained in:
Robin Ward
2014-10-10 15:10:29 -04:00
parent 5504622c1b
commit 27e68518df
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ Discourse.Dialect.replaceBlock({
rawContents: true, rawContents: true,
emitter: function(blockContents) { emitter: function(blockContents) {
var inner = blockContents.join("\n").replace(/^\s+/,''); var inner = blockContents.join("\n");
return ['p', ['pre', ['code', {'class': Discourse.SiteSettings.default_code_lang}, inner]]]; return ['p', ['pre', ['code', {'class': Discourse.SiteSettings.default_code_lang}, inner]]];
} }
}); });

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

@ -41,6 +41,9 @@ test('code', function() {
format("[code]\nx++\n[/code]", "<pre><code class=\"lang-auto\">x++</code></pre>", "makes code into pre"); format("[code]\nx++\n[/code]", "<pre><code class=\"lang-auto\">x++</code></pre>", "makes code into pre");
format("[code]\nx++\ny++\nz++\n[/code]", "<pre><code class=\"lang-auto\">x++\ny++\nz++</code></pre>", "makes code into pre"); format("[code]\nx++\ny++\nz++\n[/code]", "<pre><code class=\"lang-auto\">x++\ny++\nz++</code></pre>", "makes code into pre");
format("[code]abc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block'); format("[code]abc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block');
format("[code]\n s[/code]",
"<pre><code class=\"lang-auto\"> s</code></pre>",
"it doesn't trim leading whitespace");
}); });
test('spoiler', function() { test('spoiler', function() {