mirror of
https://github.com/wassname/jupyter_contrib_nbextensions.git
synced 2026-06-27 16:10:24 +08:00
Merge pull request #1122 from jcb91/pymd
[python-markdown] avoid js error when marked doesn't wrap things in <p>
This commit is contained in:
@@ -63,9 +63,9 @@ define([
|
||||
html = marked(text);
|
||||
} else if (out_data.msg_type === "stream") {
|
||||
html = marked(out_data.content.text);
|
||||
var t = html.match(/<p>([\s\S]*?)<\/p>/)[1]; //strip <p> and </p> that marked adds and we don't want
|
||||
html = t ? t : html;
|
||||
var q = html.match(/'([\s\S]*?)'/); // strip quotes from strings
|
||||
var t = html.match(/^\s*<p>([\s\S]*?)<\/p>\s*$/); //strip <p> and </p> that marked (maybe) adds and we don't want
|
||||
html = t !== null ? t[1] : html;
|
||||
var q = html.match(/^'([\s\S]*?)'$/); // strip quotes from strings
|
||||
if (q !== null) html = q[1]
|
||||
} else if (out_data.msg_type === "execute_result" | out_data.msg_type === "display_data" ) {
|
||||
var ul = out_data.content.data;
|
||||
@@ -90,9 +90,9 @@ define([
|
||||
} else {
|
||||
html = marked(ul['text/plain']);
|
||||
// [\s\S] is used to also catch newlines
|
||||
var t = html.match(/<p>([\s\S]*?)<\/p>/)[1]; //strip <p> and </p> that marked adds and we don't want
|
||||
html = t ? t : html;
|
||||
var q = html.match(/'([\s\S]*?)'/); // strip quotes from strings
|
||||
var t = html.match(/^\s*<p>([\s\S]*?)<\/p>\s*$/); //strip <p> and </p> that marked adds and we don't want
|
||||
html = t !== null ? t[1] : html;
|
||||
var q = html.match(/^'([\s\S]*?)'$/); // strip quotes from strings
|
||||
if (q !== null) html = q[1]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user