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

[code] should work just like other kinda of code formatting.

Browse source
This commit is contained in:
Robin Ward 2014-06-23 13:19:27 -04:00
parent 07ae7435f2
commit 42d1fcbbc2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
test/javascripts/lib/bbcode_test.js
View file

@ -25,9 +25,9 @@ test('invalid bbcode', function() {
});
test('code', function() {
format("[code]\nx++\n[/code]", "<pre>\nx++</pre>", "makes code into pre");
format("[code]\nx++\ny++\nz++\n[/code]", "<pre>\nx++\ny++\nz++</pre>", "makes code into pre");
format("[code]abc\n#def\n[/code]", '<pre>abc\n#def</pre>', 'it handles headings in a [code] block');
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]abc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block');
});
test('spoiler', function() {