From 9124cf0eafad46586a45dd8220f8dcc9094dad24 Mon Sep 17 00:00:00 2001 From: Jens Maier Date: Sun, 27 Jul 2014 15:57:40 +0200 Subject: [PATCH] FIX: auto-quote should not trigger when the first " is preceded by bbcode-like garbage. --- test/javascripts/lib/markdown_test.js | 1 + vendor/assets/javascripts/better_markdown.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/javascripts/lib/markdown_test.js b/test/javascripts/lib/markdown_test.js index 7a961900b7..7524aa6878 100644 --- a/test/javascripts/lib/markdown_test.js +++ b/test/javascripts/lib/markdown_test.js @@ -36,6 +36,7 @@ test("Auto quoting", function() { "it converts single line quotes to blockquotes"); cooked('"hello\nworld"', "

\"hello
world\"

", "It doesn't convert multi line quotes"); cooked('"hello "evil" trout"', '

"hello "evil" trout"

', "it doesn't format quotes in the middle of a line"); + cooked('["text"', '

["text"

', "it recognizes leading tag-like text"); }); test("Traditional Line Breaks", function() { diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js index 732764d8cf..017cb414da 100644 --- a/vendor/assets/javascripts/better_markdown.js +++ b/vendor/assets/javascripts/better_markdown.js @@ -662,7 +662,7 @@ return [consumed, null, nodes]; } - var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns ); + var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns, [text.substr(0, consumed)]); consumed += res[ 0 ]; // Add any returned nodes. nodes.push.apply( nodes, res.slice( 1 ) );