IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Instead of patching markdown-js, fix the issue in Discourse.

Browse Source
This commit is contained in:
Robin Ward
2014-07-21 13:09:57 -04:00
parent 90e2f1893c
commit 0f23456259
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/dialects/html.js
View File

@@ -41,7 +41,10 @@ Discourse.Dialect.registerBlock('html', function(block, next) {
var tag = m[1].split(/\s/); var tag = m[1].split(/\s/);
if (tag && tag[0] && blockTags.indexOf(tag[0]) !== -1) { if (tag && tag[0] && blockTags.indexOf(tag[0]) !== -1) {
split = splitAtLast(tag[0], block, next); split = splitAtLast(tag[0], block, next);
if (split) { return split; } if (split) {
if (split.length === 1 && split[0] === block) { return; }
return split;
}
return [ block.toString() ]; return [ block.toString() ];
} }
} }

2
vendor/assets/javascripts/better_markdown.js vendored
View File

@@ -1013,7 +1013,7 @@
if (firstBlock) { if (firstBlock) {
if (isArray(firstBlock)) { firstBlock.shift(); } firstBlock.shift();
contents.splice.apply(contents, [0, 1].concat(firstBlock)); contents.splice.apply(contents, [0, 1].concat(firstBlock));
add( last_li, loose, contents, nl ); add( last_li, loose, contents, nl );