projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d3d7dff
)
ux/Showdown.js
author
Alan Knowles
<alan@roojs.com>
Tue, 18 Oct 2016 08:44:42 +0000
(16:44 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 18 Oct 2016 08:44:42 +0000
(16:44 +0800)
ux/Showdown.js
patch
|
blob
|
history
diff --git
a/ux/Showdown.js
b/ux/Showdown.js
index
57c9cf4
..
80b957c
100644
(file)
--- a/
ux/Showdown.js
+++ b/
ux/Showdown.js
@@
-345,6
+345,9
@@
Roo.ux.Showdown.converter = function() {
// These are all the transformations that form block-level
// tags like paragraphs, headers, and list items.
//
// These are all the transformations that form block-level
// tags like paragraphs, headers, and list items.
//
+ // code blocks first... so content does not get translated..
+ text = _DoCodeBlocks(text);
+
text = _DoHeaders(text);
// Do Horizontal Rules:
text = _DoHeaders(text);
// Do Horizontal Rules:
@@
-354,7
+357,7
@@
Roo.ux.Showdown.converter = function() {
text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm,key);
text = _DoLists(text);
text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm,key);
text = _DoLists(text);
- text = _DoCodeBlocks(text);
+
text = _DoBlockQuotes(text);
// We already ran _HashHTMLBlocks() before, in Markdown(), but that
text = _DoBlockQuotes(text);
// We already ran _HashHTMLBlocks() before, in Markdown(), but that