##// END OF EJS Templates
use marked for markdown
MinRK -
Show More
@@ -42,7 +42,6 b' $(document).ready(function () {'
42 var baseProjectUrl = $('body').data('baseProjectUrl')
42 var baseProjectUrl = $('body').data('baseProjectUrl')
43
43
44 IPython.page = new IPython.Page();
44 IPython.page = new IPython.Page();
45 IPython.markdown_converter = new Markdown.Converter();
46 IPython.layout_manager = new IPython.LayoutManager();
45 IPython.layout_manager = new IPython.LayoutManager();
47 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
46 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
48 IPython.quick_help = new IPython.QuickHelp('span#quick_help_area');
47 IPython.quick_help = new IPython.QuickHelp('span#quick_help_area');
@@ -315,9 +315,9 b' var IPython = (function (IPython) {'
315 if (this.rendered === false) {
315 if (this.rendered === false) {
316 var text = this.get_text();
316 var text = this.get_text();
317 if (text === "") { text = this.placeholder; }
317 if (text === "") { text = this.placeholder; }
318 text = IPython.mathjaxutils.remove_math(text)
318 text = IPython.mathjaxutils.remove_math(text);
319 var html = IPython.markdown_converter.makeHtml(text);
319 var html = marked.parser(marked.lexer(text));
320 html = IPython.mathjaxutils.replace_math(html)
320 html = IPython.mathjaxutils.replace_math(html);
321 try {
321 try {
322 this.set_rendered(html);
322 this.set_rendered(html);
323 } catch (e) {
323 } catch (e) {
@@ -206,7 +206,7 b' class="notebook_app"'
206 <script src="{{ static_url("components/codemirror/mode/rst/rst.js") }}" charset="utf-8"></script>
206 <script src="{{ static_url("components/codemirror/mode/rst/rst.js") }}" charset="utf-8"></script>
207 <script src="{{ static_url("components/codemirror/mode/markdown/markdown.js") }}" charset="utf-8"></script>
207 <script src="{{ static_url("components/codemirror/mode/markdown/markdown.js") }}" charset="utf-8"></script>
208
208
209 <script src="{{ static_url("pagedown/Markdown.Converter.js") }}" charset="utf-8"></script>
209 <script src="{{ static_url("components/marked/lib/marked.js") }}" charset="utf-8"></script>
210
210
211 <script src="{{ static_url("prettify/prettify.js") }}" charset="utf-8"></script>
211 <script src="{{ static_url("prettify/prettify.js") }}" charset="utf-8"></script>
212 <script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
212 <script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
General Comments 0
You need to be logged in to leave comments. Login now