mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3836 from jhamrick/no-mathjax

Browse Source 
Parse markdown correctly when mathjax is disabled

Closes #3835
This commit is contained in:
Min RK 2013-07-30 18:06:36 -07:00
commit 14da30f06f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/html/static/notebook/js/mathjaxutils.js
View File

@ -131,7 +131,7 @@ IPython.mathjaxutils = (function (IPython) {
//
var remove_math = function (text) {
if (!window.MathJax) {
return text;
return [text, null];
}
var math = []; // stores math strings for later

12
IPython/html/static/notebook/js/textcell.js
View File

@ -314,10 +314,11 @@ var IPython = (function (IPython) {
MarkdownCell.prototype.render = function () {
if (this.rendered === false) {
var text = this.get_text();
var math = null;
if (text === "") { text = this.placeholder; }
var text_math = IPython.mathjaxutils.remove_math(text);
var text = text_math[0];
var math = text_math[1];
var text_and_math = IPython.mathjaxutils.remove_math(text);
text = text_and_math[0];
math = text_and_math[1];
var html = marked.parser(marked.lexer(text));
html = $(IPython.mathjaxutils.replace_math(html, math));
// links in markdown cells should open in new tabs
@ -517,13 +518,14 @@ var IPython = (function (IPython) {
HeadingCell.prototype.render = function () {
if (this.rendered === false) {
var text = this.get_text();
var math = null;
// Markdown headings must be a single line
text = text.replace(/\n/g, ' ');
if (text === "") { text = this.placeholder; }
text = Array(this.level + 1).join("#") + " " + text;
var text_and_math = IPython.mathjaxutils.remove_math(text);
var text = text_and_math[0];
var math = text_and_math[1];
text = text_and_math[0];
math = text_and_math[1];
var html = marked.parser(marked.lexer(text));
var h = $(IPython.mathjaxutils.replace_math(html, math));
// add id and linkback anchor