codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3715 from gwwar/quote_newline_code

Browse source 
workaround for code block being parsed before quote block.
This commit is contained in:
Robin Ward 2015-09-08 16:52:46 -04:00
commit 1c90f77d09
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/discourse/dialects/code_dialect.js
View file

@ -33,6 +33,7 @@ function codeFlattenBlocks(blocks) {
Discourse.Dialect.replaceBlock({ Discourse.Dialect.replaceBlock({
start: /^`{3}([^\n\[\]]+)?\n?([\s\S]*)?/gm, start: /^`{3}([^\n\[\]]+)?\n?([\s\S]*)?/gm,
stop: /^```$/gm, stop: /^```$/gm,
withoutLeading: /\[quote/gm, //if leading text contains a quote this should not match
emitter: function(blockContents, matches) { emitter: function(blockContents, matches) {
var klass = Discourse.SiteSettings.default_code_lang; var klass = Discourse.SiteSettings.default_code_lang;

6
app/assets/javascripts/discourse/dialects/dialect.js
View file

@ -501,6 +501,12 @@ Discourse.Dialect = {
var pos = args.start.lastIndex - match[0].length, var pos = args.start.lastIndex - match[0].length,
leading = block.slice(0, pos), leading = block.slice(0, pos),
trailing = match[2] ? match[2].replace(/^\n*/, "") : ""; trailing = match[2] ? match[2].replace(/^\n*/, "") : "";
if(args.withoutLeading && args.withoutLeading.test(leading)) {
//The other leading block should be processed first! eg a code block wrapped around a code block.
return;
}
// just give up if there's no stop tag in this or any next block // just give up if there's no stop tag in this or any next block
args.stop.lastIndex = block.length - trailing.length; args.stop.lastIndex = block.length - trailing.length;
if (!args.stop.exec(block) && lastChance()) { return; } if (!args.stop.exec(block) && lastChance()) { return; }

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

@ -160,6 +160,13 @@ test("quote formatting", function() {
"<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" + "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" +
"</div><blockquote><p>[quote=\"Bob, post:2, topic:1\"]</p></blockquote></aside>", "</div><blockquote><p>[quote=\"Bob, post:2, topic:1\"]</p></blockquote></aside>",
"handles mismatched nested quote tags"); "handles mismatched nested quote tags");
formatQ("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
"<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
"quotes can have code blocks without leading newline");
formatQ("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
"<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
"quotes can have code blocks with leading newline");
}); });
test("quotes with trailing formatting", function() { test("quotes with trailing formatting", function() {