').addClass('html_cell_input');
+ TextCell.prototype.create_element = function () {
+ var cell = $("
").addClass('cell text_cell border-box-sizing');
+ var input_area = $('
').addClass('text_cell_input');
this.code_mirror = CodeMirror(input_area.get(0), {
indentUnit : 4,
enterMode : 'flat',
tabMode: 'shift',
- mode: 'htmlmixed',
+ mode: this.code_mirror_mode,
theme: 'default',
value: this.placeholder
});
// The tabindex=-1 makes this div focusable.
- var render_area = $('
').addClass('html_cell_render').
+ var render_area = $('
').addClass('text_cell_render').
addClass('rendered_html').attr('tabindex','-1');
cell.append(input_area).append(render_area);
this.element = cell;
};
- HTMLCell.prototype.bind_events = function () {
+ TextCell.prototype.bind_events = function () {
IPython.Cell.prototype.bind_events.apply(this);
var that = this;
this.element.keydown(function (event) {
@@ -49,19 +52,19 @@ var IPython = (function (IPython) {
};
- HTMLCell.prototype.select = function () {
+ TextCell.prototype.select = function () {
IPython.Cell.prototype.select.apply(this);
- var output = this.element.find("div.html_cell_render");
+ var output = this.element.find("div.text_cell_render");
output.trigger('focus');
};
- HTMLCell.prototype.edit = function () {
+ TextCell.prototype.edit = function () {
if (this.rendered === true) {
- var html_cell = this.element;
- var output = html_cell.find("div.html_cell_render");
+ var text_cell = this.element;
+ var output = text_cell.find("div.text_cell_render");
output.hide();
- html_cell.find('div.html_cell_input').show();
+ text_cell.find('div.text_cell_input').show();
this.code_mirror.focus();
this.code_mirror.refresh();
this.rendered = false;
@@ -69,51 +72,45 @@ var IPython = (function (IPython) {
};
- HTMLCell.prototype.render = function () {
- if (this.rendered === false) {
- var html_cell = this.element;
- var output = html_cell.find("div.html_cell_render");
- var text = this.get_source();
- if (text === "") {text = this.placeholder;};
- this.set_rendered(text);
- MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
- html_cell.find('div.html_cell_input').hide();
- output.show();
- this.rendered = true;
- };
- };
+ // Subclasses must define render.
+ TextCell.prototype.render = function () {};
- HTMLCell.prototype.config_mathjax = function () {
- var html_cell = this.element;
+ TextCell.prototype.config_mathjax = function () {
+ var text_cell = this.element;
var that = this;
- html_cell.click(function () {
+ text_cell.click(function () {
that.edit();
}).focusout(function () {
that.render();
});
- html_cell.trigger("focusout");
+ text_cell.trigger("focusout");
};
- HTMLCell.prototype.get_source = function() {
+ TextCell.prototype.get_source = function() {
return this.code_mirror.getValue();
};
- HTMLCell.prototype.set_source = function(text) {
+ TextCell.prototype.set_source = function(text) {
this.code_mirror.setValue(text);
this.code_mirror.refresh();
};
- HTMLCell.prototype.set_rendered = function(text) {
- this.element.find('div.html_cell_render').html(text);
+ TextCell.prototype.get_rendered = function(text) {
+ return this.element.find('div.text_cell_render').html();
+ };
+
+
+ TextCell.prototype.set_rendered = function(text) {
+ this.element.find('div.text_cell_render').html(text);
};
- HTMLCell.prototype.at_top = function () {
+ TextCell.prototype.at_top = function () {
if (this.rendered) {
return true;
} else {
@@ -122,7 +119,7 @@ var IPython = (function (IPython) {
};
- HTMLCell.prototype.at_bottom = function () {
+ TextCell.prototype.at_bottom = function () {
if (this.rendered) {
return true;
} else {
@@ -131,8 +128,8 @@ var IPython = (function (IPython) {
};
- HTMLCell.prototype.fromJSON = function (data) {
- if (data.cell_type === 'html') {
+ TextCell.prototype.fromJSON = function (data) {
+ if (data.cell_type === this.cell_type) {
if (data.source !== undefined) {
this.set_source(data.source);
this.set_rendered(data.source);
@@ -141,14 +138,110 @@ var IPython = (function (IPython) {
}
- HTMLCell.prototype.toJSON = function () {
+ TextCell.prototype.toJSON = function () {
var data = {}
- data.cell_type = 'html';
+ data.cell_type = this.cell_type;
data.source = this.get_source();
+ data.rendered = this.get_rendered();
return data;
};
+
+ // HTMLCell
+
+ var HTMLCell = function (notebook) {
+ this.placeholder = "Type
HTML and LaTeX: $\\alpha^2$";
+ IPython.TextCell.apply(this, arguments);
+ this.cell_type = 'html';
+ };
+
+
+ HTMLCell.prototype = new TextCell();
+
+
+ HTMLCell.prototype.render = function () {
+ if (this.rendered === false) {
+ var text = this.get_source();
+ if (text === "") {text = this.placeholder;};
+ this.set_rendered(text);
+ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
+ this.element.find('div.text_cell_input').hide();
+ this.element.find("div.text_cell_render").show();
+ this.rendered = true;
+ };
+ };
+
+
+ // MarkdownCell
+
+ var MarkdownCell = function (notebook) {
+ this.placeholder = "Type *Markdown* and LaTeX: $\\alpha^2$";
+ IPython.TextCell.apply(this, arguments);
+ this.cell_type = 'markdown';
+ };
+
+
+ MarkdownCell.prototype = new TextCell();
+
+
+ MarkdownCell.prototype.render = function () {
+ if (this.rendered === false) {
+ var text = this.get_source();
+ if (text === "") {text = this.placeholder;};
+ var html = IPython.markdown_converter.makeHtml(text);
+ this.set_rendered(html);
+ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
+ this.element.find('div.text_cell_input').hide();
+ this.element.find("div.text_cell_render").show();
+ this.rendered = true;
+ };
+ };
+
+
+ // RSTCell
+
+ var RSTCell = function (notebook) {
+ this.placeholder = "Type *ReStructured Text* and LaTeX: $\\alpha^2$";
+ IPython.TextCell.apply(this, arguments);
+ this.cell_type = 'rst';
+ };
+
+
+ RSTCell.prototype = new TextCell();
+
+
+ RSTCell.prototype.render = function () {
+ if (this.rendered === false) {
+ var text = this.get_source();
+ if (text === "") {text = this.placeholder;};
+ var settings = {
+ processData : false,
+ cache : false,
+ type : "POST",
+ data : text,
+ headers : {'Content-Type': 'application/x-rst'},
+ success : $.proxy(this.handle_render,this)
+ };
+ $.ajax("/rstservice/render", settings);
+ this.element.find('div.text_cell_input').hide();
+ this.element.find("div.text_cell_render").show();
+ this.set_rendered("Rendering...");
+ };
+ };
+
+
+ RSTCell.prototype.handle_render = function (data, status, xhr) {
+ this.set_rendered(data);
+ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
+ this.rendered = true;
+ };
+
+
+ IPython.TextCell = TextCell;
IPython.HTMLCell = HTMLCell;
+ IPython.MarkdownCell = MarkdownCell;
+ IPython.RSTCell = RSTCell;
+
return IPython;
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 5b463da..fb23792 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -28,6 +28,8 @@
+
+
@@ -82,6 +84,14 @@