##// END OF EJS Templates
Merge pull request #3531 from minrk/headingmath...
Matthias Bussonnier -
r11258:8206b14b merge
parent child Browse files
Show More
@@ -27,7 +27,7 var IPython = (function (IPython) {
27 *
27 *
28 * @class TextCell
28 * @class TextCell
29 * @constructor TextCell
29 * @constructor TextCell
30 * @extend Ipython.Cell
30 * @extend IPython.Cell
31 * @param {object|undefined} [options]
31 * @param {object|undefined} [options]
32 * @param [options.cm_config] {object} config to pass to CodeMirror, will extend/overwrite default config
32 * @param [options.cm_config] {object} config to pass to CodeMirror, will extend/overwrite default config
33 * @param [options.placeholder] {string} default string to use when souce in empty for rendering (only use in some TextCell subclass)
33 * @param [options.placeholder] {string} default string to use when souce in empty for rendering (only use in some TextCell subclass)
@@ -285,7 +285,7 var IPython = (function (IPython) {
285 /**
285 /**
286 * @class MarkdownCell
286 * @class MarkdownCell
287 * @constructor MarkdownCell
287 * @constructor MarkdownCell
288 * @extends Ipython.HtmlCell
288 * @extends IPython.HTMLCell
289 */
289 */
290 var MarkdownCell = function (options) {
290 var MarkdownCell = function (options) {
291 var options = options || {};
291 var options = options || {};
@@ -342,7 +342,7 var IPython = (function (IPython) {
342 /**
342 /**
343 * @class RawCell
343 * @class RawCell
344 * @constructor RawCell
344 * @constructor RawCell
345 * @extends Ipython.TextCell
345 * @extends IPython.TextCell
346 */
346 */
347 var RawCell = function (options) {
347 var RawCell = function (options) {
348
348
@@ -437,12 +437,12 var IPython = (function (IPython) {
437
437
438 /**
438 /**
439 * @class HeadingCell
439 * @class HeadingCell
440 * @extends Ipython.TextCell
440 * @extends IPython.TextCell
441 */
441 */
442
442
443 /**
443 /**
444 * @constructor HeadingCell
444 * @constructor HeadingCell
445 * @extends Ipython.TextCell
445 * @extends IPython.TextCell
446 */
446 */
447 var HeadingCell = function (options) {
447 var HeadingCell = function (options) {
448
448
@@ -501,17 +501,17 var IPython = (function (IPython) {
501 };
501 };
502
502
503
503
504 HeadingCell.prototype.set_rendered = function (text) {
504 HeadingCell.prototype.set_rendered = function (html) {
505 var r = this.element.find("div.text_cell_render");
505 var r = this.element.find("div.text_cell_render");
506 r.empty();
506 r.empty();
507 var link = text.replace(/ /g, '_');
507 var link = $(html).text().replace(/ /g, '_');
508 r.append(
508 r.append(
509 $('<h'+this.level+'/>')
509 $('<h'+this.level+'/>')
510 .append(
510 .append(
511 $('<a/>')
511 $('<a/>')
512 .addClass('heading-anchor')
512 .addClass('heading-anchor')
513 .attr('id', link)
513 .attr('id', link)
514 .html(text)
514 .html(html)
515 ).append(
515 ).append(
516 $('<a/>')
516 $('<a/>')
517 .addClass('anchor-link')
517 .addClass('anchor-link')
@@ -532,7 +532,11 var IPython = (function (IPython) {
532 if (this.rendered === false) {
532 if (this.rendered === false) {
533 var text = this.get_text();
533 var text = this.get_text();
534 if (text === "") { text = this.placeholder; }
534 if (text === "") { text = this.placeholder; }
535 this.set_rendered(text);
535 text = IPython.mathjaxutils.remove_math(text);
536 var html = marked.parser(marked.lexer(text));
537 html = $(IPython.mathjaxutils.replace_math(html)).html();
538
539 this.set_rendered(html);
536 this.typeset();
540 this.typeset();
537 this.element.find('div.text_cell_input').hide();
541 this.element.find('div.text_cell_input').hide();
538 this.element.find("div.text_cell_render").show();
542 this.element.find("div.text_cell_render").show();
General Comments 0
You need to be logged in to leave comments. Login now