Comparing version 0.2.19 to 0.2.20
@@ -95,6 +95,2 @@ /** | ||
documentMeta = /^(\w+): (.+)\n/; | ||
xmlignoreStart = /\n\s*<!--\s+startcontent\s+-->\s*\n/; | ||
jsignoreStart = /\n\s*\/\*\s+startcontent\s+\*\/\s*\n/; | ||
xmlignoreEnd = /\n\s*<!--\s+endcontent\s+-->\s*\n/; | ||
jsignoreEnd = /\n\s*\/\*\s+endcontent\s+\*\/\s*\n/; | ||
@@ -736,20 +732,2 @@ | ||
case 'code': { | ||
var blocks = []; | ||
function blockSplit(regExpStart, regExpEnd) { | ||
var blocks = []; | ||
var firstSplit = token.text.split(token.text.match(regExpStart)); | ||
blocks.push(firstSplit[0]); | ||
var secondSplit = firstSplit[1].split(firstSplit[1].match(regExpEnd)); | ||
blocks.push(secondSplit[0], secondSplit[1]); | ||
return blocks; | ||
} | ||
if (token.text.match(xmlignoreStart)) { | ||
blocks = blockSplit(xmlignoreStart, xmlignoreEnd); | ||
} | ||
else if (token.text.match(jsignoreStart)) { | ||
blocks = blockSplit(jsignoreStart, jsignoreEnd); | ||
} | ||
if (options.highlight) { | ||
@@ -764,46 +742,16 @@ token.code = options.highlight(token.text, token.lang); | ||
} | ||
else if (token.lang && token.lang !== "no-highlight") { | ||
else if (token.lang && token.lang !== "no-highlight" && token.demo === undefined) { | ||
token.lang = token.lang === "html" ? "xml" : token.lang; | ||
token.text = hljs.highlight(token.lang, token.text).value; | ||
} | ||
else if (!token.lang) | ||
token.text = hljs.highlightAuto(token.text).value; | ||
if (blocks.length > 0) { | ||
blocks = blocks.map(function (block) { | ||
block = hljs.highlight(token.lang, block).value; | ||
return block; | ||
}); | ||
} | ||
else { | ||
token.text = hljs.highlight(token.lang, token.text).value; | ||
} | ||
} | ||
else if (!token.lang) { | ||
if (blocks > 0) { | ||
blocks = blocks.map(function (block) { | ||
block = hljs.highlightAuto(block).value; | ||
return block; | ||
}); | ||
} | ||
else { | ||
token.text = hljs.highlightAuto(token.text).value; | ||
} | ||
} | ||
// intentionally skip 'no-highlight' | ||
var pretag = "<pre " | ||
++metadata.codeCounter; | ||
if (token.demo !== undefined) | ||
pretag += 'class="demo" '; | ||
pretag += 'id="snippetcontent-' + ++metadata.codeCounter + '">'; | ||
return '<textarea id=codecontent-"' + metadata.codeCounter + '" class=demo language-' + token.lang + '">' + token.text + '</textarea>'; | ||
if (blocks.length > 0) { | ||
var divtag = "<div " | ||
if (token.demo !== undefined) | ||
divtag += 'class="demo" '; | ||
divtag += 'id="originalcontent-' + metadata.codeCounter + '">'; | ||
var pretag = '<pre id="codecontent-' + metadata.codeCounter + '">'; | ||
divtag += (options.preHighlightOriginals ? blocks.join("\n") : escape(token.text)) + "</div>"; | ||
return divtag + pretag + '<code class="snippetcontent' | ||
+ (token.lang ? ' language-' + token.lang + '"' : '') + '>' | ||
+ blocks[1] | ||
+ '</code></pre>\n'; | ||
} | ||
return pretag + '<code' | ||
@@ -810,0 +758,0 @@ + (token.lang |
{ | ||
"name" : "namp", | ||
"version" : "0.2.19", | ||
"version" : "0.2.20", | ||
"description" : "Markdown parser for Node, with Maruku, GFM, and PHP Extras support, plus more. Based on marked.", | ||
@@ -5,0 +5,0 @@ "keywords" : [ "markdown", "maruku", "gfm", "text processing", "ast" ], |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
262233
1152