##// END OF EJS Templates
Merge branch 'repr_html' of https://github.com/minrk/ipython into minrk-repr_html
Brian E. Granger -
r4407:a65c2d31 merge
parent child Browse files
Show More
@@ -285,6 +285,9 b' div.output_latex {'
285 font-size: 116%;
285 font-size: 116%;
286 }
286 }
287
287
288 div.output_html {
289 }
290
288 div.output_png {
291 div.output_png {
289 }
292 }
290
293
@@ -175,7 +175,9 b' var IPython = (function (IPython) {'
175
175
176
176
177 CodeCell.prototype.append_display_data = function (data, element) {
177 CodeCell.prototype.append_display_data = function (data, element) {
178 if (data["text/latex"] !== undefined) {
178 if (data["text/html"] !== undefined) {
179 this.append_html(data["text/html"], element);
180 } else if (data["text/latex"] !== undefined) {
179 this.append_latex(data["text/latex"], element);
181 this.append_latex(data["text/latex"], element);
180 // If it is undefined, then we just appended to div.output, which
182 // If it is undefined, then we just appended to div.output, which
181 // makes the latex visible and we can typeset it. The typesetting
183 // makes the latex visible and we can typeset it. The typesetting
@@ -194,6 +196,15 b' var IPython = (function (IPython) {'
194 };
196 };
195
197
196
198
199 CodeCell.prototype.append_html = function (html, element) {
200 element = element || this.element.find("div.output");
201 var toinsert = $("<div/>").addClass("output_area output_html");
202 toinsert.append(html);
203 element.append(toinsert);
204 return element;
205 }
206
207
197 CodeCell.prototype.append_stream = function (data, element) {
208 CodeCell.prototype.append_stream = function (data, element) {
198 element = element || this.element.find("div.output");
209 element = element || this.element.find("div.output");
199 var toinsert = $("<div/>").addClass("output_area output_stream");
210 var toinsert = $("<div/>").addClass("output_area output_stream");
General Comments 0
You need to be logged in to leave comments. Login now