##// END OF EJS Templates
fix ambiguous raw_input classes
MinRK -
Show More
@@ -1,874 +1,874 b''
1 //----------------------------------------------------------------------------
1 //----------------------------------------------------------------------------
2 // Copyright (C) 2008 The IPython Development Team
2 // Copyright (C) 2008 The IPython Development Team
3 //
3 //
4 // Distributed under the terms of the BSD License. The full license is in
4 // Distributed under the terms of the BSD License. The full license is in
5 // the file COPYING, distributed as part of this software.
5 // the file COPYING, distributed as part of this software.
6 //----------------------------------------------------------------------------
6 //----------------------------------------------------------------------------
7
7
8 //============================================================================
8 //============================================================================
9 // OutputArea
9 // OutputArea
10 //============================================================================
10 //============================================================================
11
11
12 /**
12 /**
13 * @module IPython
13 * @module IPython
14 * @namespace IPython
14 * @namespace IPython
15 * @submodule OutputArea
15 * @submodule OutputArea
16 */
16 */
17 var IPython = (function (IPython) {
17 var IPython = (function (IPython) {
18 "use strict";
18 "use strict";
19
19
20 var utils = IPython.utils;
20 var utils = IPython.utils;
21
21
22 /**
22 /**
23 * @class OutputArea
23 * @class OutputArea
24 *
24 *
25 * @constructor
25 * @constructor
26 */
26 */
27
27
28 var OutputArea = function (selector, prompt_area) {
28 var OutputArea = function (selector, prompt_area) {
29 this.selector = selector;
29 this.selector = selector;
30 this.wrapper = $(selector);
30 this.wrapper = $(selector);
31 this.outputs = [];
31 this.outputs = [];
32 this.collapsed = false;
32 this.collapsed = false;
33 this.scrolled = false;
33 this.scrolled = false;
34 this.trusted = true;
34 this.trusted = true;
35 this.clear_queued = null;
35 this.clear_queued = null;
36 if (prompt_area === undefined) {
36 if (prompt_area === undefined) {
37 this.prompt_area = true;
37 this.prompt_area = true;
38 } else {
38 } else {
39 this.prompt_area = prompt_area;
39 this.prompt_area = prompt_area;
40 }
40 }
41 this.create_elements();
41 this.create_elements();
42 this.style();
42 this.style();
43 this.bind_events();
43 this.bind_events();
44 };
44 };
45
45
46
46
47 /**
47 /**
48 * Class prototypes
48 * Class prototypes
49 **/
49 **/
50
50
51 OutputArea.prototype.create_elements = function () {
51 OutputArea.prototype.create_elements = function () {
52 this.element = $("<div/>");
52 this.element = $("<div/>");
53 this.collapse_button = $("<div/>");
53 this.collapse_button = $("<div/>");
54 this.prompt_overlay = $("<div/>");
54 this.prompt_overlay = $("<div/>");
55 this.wrapper.append(this.prompt_overlay);
55 this.wrapper.append(this.prompt_overlay);
56 this.wrapper.append(this.element);
56 this.wrapper.append(this.element);
57 this.wrapper.append(this.collapse_button);
57 this.wrapper.append(this.collapse_button);
58 };
58 };
59
59
60
60
61 OutputArea.prototype.style = function () {
61 OutputArea.prototype.style = function () {
62 this.collapse_button.hide();
62 this.collapse_button.hide();
63 this.prompt_overlay.hide();
63 this.prompt_overlay.hide();
64
64
65 this.wrapper.addClass('output_wrapper');
65 this.wrapper.addClass('output_wrapper');
66 this.element.addClass('output');
66 this.element.addClass('output');
67
67
68 this.collapse_button.addClass("btn output_collapsed");
68 this.collapse_button.addClass("btn output_collapsed");
69 this.collapse_button.attr('title', 'click to expand output');
69 this.collapse_button.attr('title', 'click to expand output');
70 this.collapse_button.text('. . .');
70 this.collapse_button.text('. . .');
71
71
72 this.prompt_overlay.addClass('out_prompt_overlay prompt');
72 this.prompt_overlay.addClass('out_prompt_overlay prompt');
73 this.prompt_overlay.attr('title', 'click to expand output; double click to hide output');
73 this.prompt_overlay.attr('title', 'click to expand output; double click to hide output');
74
74
75 this.collapse();
75 this.collapse();
76 };
76 };
77
77
78 /**
78 /**
79 * Should the OutputArea scroll?
79 * Should the OutputArea scroll?
80 * Returns whether the height (in lines) exceeds a threshold.
80 * Returns whether the height (in lines) exceeds a threshold.
81 *
81 *
82 * @private
82 * @private
83 * @method _should_scroll
83 * @method _should_scroll
84 * @param [lines=100]{Integer}
84 * @param [lines=100]{Integer}
85 * @return {Bool}
85 * @return {Bool}
86 *
86 *
87 */
87 */
88 OutputArea.prototype._should_scroll = function (lines) {
88 OutputArea.prototype._should_scroll = function (lines) {
89 if (lines <=0 ){ return }
89 if (lines <=0 ){ return }
90 if (!lines) {
90 if (!lines) {
91 lines = 100;
91 lines = 100;
92 }
92 }
93 // line-height from http://stackoverflow.com/questions/1185151
93 // line-height from http://stackoverflow.com/questions/1185151
94 var fontSize = this.element.css('font-size');
94 var fontSize = this.element.css('font-size');
95 var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5);
95 var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5);
96
96
97 return (this.element.height() > lines * lineHeight);
97 return (this.element.height() > lines * lineHeight);
98 };
98 };
99
99
100
100
101 OutputArea.prototype.bind_events = function () {
101 OutputArea.prototype.bind_events = function () {
102 var that = this;
102 var that = this;
103 this.prompt_overlay.dblclick(function () { that.toggle_output(); });
103 this.prompt_overlay.dblclick(function () { that.toggle_output(); });
104 this.prompt_overlay.click(function () { that.toggle_scroll(); });
104 this.prompt_overlay.click(function () { that.toggle_scroll(); });
105
105
106 this.element.resize(function () {
106 this.element.resize(function () {
107 // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled
107 // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled
108 if ( IPython.utils.browser[0] === "Firefox" ) {
108 if ( IPython.utils.browser[0] === "Firefox" ) {
109 return;
109 return;
110 }
110 }
111 // maybe scroll output,
111 // maybe scroll output,
112 // if it's grown large enough and hasn't already been scrolled.
112 // if it's grown large enough and hasn't already been scrolled.
113 if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) {
113 if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) {
114 that.scroll_area();
114 that.scroll_area();
115 }
115 }
116 });
116 });
117 this.collapse_button.click(function () {
117 this.collapse_button.click(function () {
118 that.expand();
118 that.expand();
119 });
119 });
120 };
120 };
121
121
122
122
123 OutputArea.prototype.collapse = function () {
123 OutputArea.prototype.collapse = function () {
124 if (!this.collapsed) {
124 if (!this.collapsed) {
125 this.element.hide();
125 this.element.hide();
126 this.prompt_overlay.hide();
126 this.prompt_overlay.hide();
127 if (this.element.html()){
127 if (this.element.html()){
128 this.collapse_button.show();
128 this.collapse_button.show();
129 }
129 }
130 this.collapsed = true;
130 this.collapsed = true;
131 }
131 }
132 };
132 };
133
133
134
134
135 OutputArea.prototype.expand = function () {
135 OutputArea.prototype.expand = function () {
136 if (this.collapsed) {
136 if (this.collapsed) {
137 this.collapse_button.hide();
137 this.collapse_button.hide();
138 this.element.show();
138 this.element.show();
139 this.prompt_overlay.show();
139 this.prompt_overlay.show();
140 this.collapsed = false;
140 this.collapsed = false;
141 }
141 }
142 };
142 };
143
143
144
144
145 OutputArea.prototype.toggle_output = function () {
145 OutputArea.prototype.toggle_output = function () {
146 if (this.collapsed) {
146 if (this.collapsed) {
147 this.expand();
147 this.expand();
148 } else {
148 } else {
149 this.collapse();
149 this.collapse();
150 }
150 }
151 };
151 };
152
152
153
153
154 OutputArea.prototype.scroll_area = function () {
154 OutputArea.prototype.scroll_area = function () {
155 this.element.addClass('output_scroll');
155 this.element.addClass('output_scroll');
156 this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide');
156 this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide');
157 this.scrolled = true;
157 this.scrolled = true;
158 };
158 };
159
159
160
160
161 OutputArea.prototype.unscroll_area = function () {
161 OutputArea.prototype.unscroll_area = function () {
162 this.element.removeClass('output_scroll');
162 this.element.removeClass('output_scroll');
163 this.prompt_overlay.attr('title', 'click to scroll output; double click to hide');
163 this.prompt_overlay.attr('title', 'click to scroll output; double click to hide');
164 this.scrolled = false;
164 this.scrolled = false;
165 };
165 };
166
166
167 /**
167 /**
168 *
168 *
169 * Scroll OutputArea if height supperior than a threshold (in lines).
169 * Scroll OutputArea if height supperior than a threshold (in lines).
170 *
170 *
171 * Threshold is a maximum number of lines. If unspecified, defaults to
171 * Threshold is a maximum number of lines. If unspecified, defaults to
172 * OutputArea.minimum_scroll_threshold.
172 * OutputArea.minimum_scroll_threshold.
173 *
173 *
174 * Negative threshold will prevent the OutputArea from ever scrolling.
174 * Negative threshold will prevent the OutputArea from ever scrolling.
175 *
175 *
176 * @method scroll_if_long
176 * @method scroll_if_long
177 *
177 *
178 * @param [lines=20]{Number} Default to 20 if not set,
178 * @param [lines=20]{Number} Default to 20 if not set,
179 * behavior undefined for value of `0`.
179 * behavior undefined for value of `0`.
180 *
180 *
181 **/
181 **/
182 OutputArea.prototype.scroll_if_long = function (lines) {
182 OutputArea.prototype.scroll_if_long = function (lines) {
183 var n = lines | OutputArea.minimum_scroll_threshold;
183 var n = lines | OutputArea.minimum_scroll_threshold;
184 if(n <= 0){
184 if(n <= 0){
185 return
185 return
186 }
186 }
187
187
188 if (this._should_scroll(n)) {
188 if (this._should_scroll(n)) {
189 // only allow scrolling long-enough output
189 // only allow scrolling long-enough output
190 this.scroll_area();
190 this.scroll_area();
191 }
191 }
192 };
192 };
193
193
194
194
195 OutputArea.prototype.toggle_scroll = function () {
195 OutputArea.prototype.toggle_scroll = function () {
196 if (this.scrolled) {
196 if (this.scrolled) {
197 this.unscroll_area();
197 this.unscroll_area();
198 } else {
198 } else {
199 // only allow scrolling long-enough output
199 // only allow scrolling long-enough output
200 this.scroll_if_long();
200 this.scroll_if_long();
201 }
201 }
202 };
202 };
203
203
204
204
205 // typeset with MathJax if MathJax is available
205 // typeset with MathJax if MathJax is available
206 OutputArea.prototype.typeset = function () {
206 OutputArea.prototype.typeset = function () {
207 if (window.MathJax){
207 if (window.MathJax){
208 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
208 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
209 }
209 }
210 };
210 };
211
211
212
212
213 OutputArea.prototype.handle_output = function (msg) {
213 OutputArea.prototype.handle_output = function (msg) {
214 var json = {};
214 var json = {};
215 var msg_type = json.output_type = msg.header.msg_type;
215 var msg_type = json.output_type = msg.header.msg_type;
216 var content = msg.content;
216 var content = msg.content;
217 if (msg_type === "stream") {
217 if (msg_type === "stream") {
218 json.text = content.data;
218 json.text = content.data;
219 json.stream = content.name;
219 json.stream = content.name;
220 } else if (msg_type === "display_data") {
220 } else if (msg_type === "display_data") {
221 json = content.data;
221 json = content.data;
222 json.output_type = msg_type;
222 json.output_type = msg_type;
223 json.metadata = content.metadata;
223 json.metadata = content.metadata;
224 } else if (msg_type === "pyout") {
224 } else if (msg_type === "pyout") {
225 json = content.data;
225 json = content.data;
226 json.output_type = msg_type;
226 json.output_type = msg_type;
227 json.metadata = content.metadata;
227 json.metadata = content.metadata;
228 json.prompt_number = content.execution_count;
228 json.prompt_number = content.execution_count;
229 } else if (msg_type === "pyerr") {
229 } else if (msg_type === "pyerr") {
230 json.ename = content.ename;
230 json.ename = content.ename;
231 json.evalue = content.evalue;
231 json.evalue = content.evalue;
232 json.traceback = content.traceback;
232 json.traceback = content.traceback;
233 }
233 }
234 this.append_output(json);
234 this.append_output(json);
235 };
235 };
236
236
237
237
238 OutputArea.prototype.rename_keys = function (data, key_map) {
238 OutputArea.prototype.rename_keys = function (data, key_map) {
239 var remapped = {};
239 var remapped = {};
240 for (var key in data) {
240 for (var key in data) {
241 var new_key = key_map[key] || key;
241 var new_key = key_map[key] || key;
242 remapped[new_key] = data[key];
242 remapped[new_key] = data[key];
243 }
243 }
244 return remapped;
244 return remapped;
245 };
245 };
246
246
247
247
248 OutputArea.output_types = [
248 OutputArea.output_types = [
249 'application/javascript',
249 'application/javascript',
250 'text/html',
250 'text/html',
251 'text/latex',
251 'text/latex',
252 'image/svg+xml',
252 'image/svg+xml',
253 'image/png',
253 'image/png',
254 'image/jpeg',
254 'image/jpeg',
255 'application/pdf',
255 'application/pdf',
256 'text/plain'
256 'text/plain'
257 ];
257 ];
258
258
259 OutputArea.prototype.validate_output = function (json) {
259 OutputArea.prototype.validate_output = function (json) {
260 // scrub invalid outputs
260 // scrub invalid outputs
261 // TODO: right now everything is a string, but JSON really shouldn't be.
261 // TODO: right now everything is a string, but JSON really shouldn't be.
262 // nbformat 4 will fix that.
262 // nbformat 4 will fix that.
263 $.map(OutputArea.output_types, function(key){
263 $.map(OutputArea.output_types, function(key){
264 if (json[key] !== undefined && typeof json[key] !== 'string') {
264 if (json[key] !== undefined && typeof json[key] !== 'string') {
265 console.log("Invalid type for " + key, json[key]);
265 console.log("Invalid type for " + key, json[key]);
266 delete json[key];
266 delete json[key];
267 }
267 }
268 });
268 });
269 return json;
269 return json;
270 };
270 };
271
271
272 OutputArea.prototype.append_output = function (json) {
272 OutputArea.prototype.append_output = function (json) {
273 this.expand();
273 this.expand();
274 // Clear the output if clear is queued.
274 // Clear the output if clear is queued.
275 var needs_height_reset = false;
275 var needs_height_reset = false;
276 if (this.clear_queued) {
276 if (this.clear_queued) {
277 this.clear_output(false);
277 this.clear_output(false);
278 needs_height_reset = true;
278 needs_height_reset = true;
279 }
279 }
280
280
281 // validate output data types
281 // validate output data types
282 json = this.validate_output(json);
282 json = this.validate_output(json);
283
283
284 if (json.output_type === 'pyout') {
284 if (json.output_type === 'pyout') {
285 this.append_pyout(json);
285 this.append_pyout(json);
286 } else if (json.output_type === 'pyerr') {
286 } else if (json.output_type === 'pyerr') {
287 this.append_pyerr(json);
287 this.append_pyerr(json);
288 } else if (json.output_type === 'display_data') {
288 } else if (json.output_type === 'display_data') {
289 this.append_display_data(json);
289 this.append_display_data(json);
290 } else if (json.output_type === 'stream') {
290 } else if (json.output_type === 'stream') {
291 this.append_stream(json);
291 this.append_stream(json);
292 }
292 }
293
293
294 this.outputs.push(json);
294 this.outputs.push(json);
295
295
296 // Only reset the height to automatic if the height is currently
296 // Only reset the height to automatic if the height is currently
297 // fixed (done by wait=True flag on clear_output).
297 // fixed (done by wait=True flag on clear_output).
298 if (needs_height_reset) {
298 if (needs_height_reset) {
299 this.element.height('');
299 this.element.height('');
300 }
300 }
301
301
302 var that = this;
302 var that = this;
303 setTimeout(function(){that.element.trigger('resize');}, 100);
303 setTimeout(function(){that.element.trigger('resize');}, 100);
304 };
304 };
305
305
306
306
307 OutputArea.prototype.create_output_area = function () {
307 OutputArea.prototype.create_output_area = function () {
308 var oa = $("<div/>").addClass("output_area");
308 var oa = $("<div/>").addClass("output_area");
309 if (this.prompt_area) {
309 if (this.prompt_area) {
310 oa.append($('<div/>').addClass('prompt'));
310 oa.append($('<div/>').addClass('prompt'));
311 }
311 }
312 return oa;
312 return oa;
313 };
313 };
314
314
315
315
316 function _get_metadata_key(metadata, key, mime) {
316 function _get_metadata_key(metadata, key, mime) {
317 var mime_md = metadata[mime];
317 var mime_md = metadata[mime];
318 // mime-specific higher priority
318 // mime-specific higher priority
319 if (mime_md && mime_md[key] !== undefined) {
319 if (mime_md && mime_md[key] !== undefined) {
320 return mime_md[key];
320 return mime_md[key];
321 }
321 }
322 // fallback on global
322 // fallback on global
323 return metadata[key];
323 return metadata[key];
324 }
324 }
325
325
326 OutputArea.prototype.create_output_subarea = function(md, classes, mime) {
326 OutputArea.prototype.create_output_subarea = function(md, classes, mime) {
327 var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
327 var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
328 if (_get_metadata_key(md, 'isolated', mime)) {
328 if (_get_metadata_key(md, 'isolated', mime)) {
329 // Create an iframe to isolate the subarea from the rest of the
329 // Create an iframe to isolate the subarea from the rest of the
330 // document
330 // document
331 var iframe = $('<iframe/>').addClass('box-flex1');
331 var iframe = $('<iframe/>').addClass('box-flex1');
332 iframe.css({'height':1, 'width':'100%', 'display':'block'});
332 iframe.css({'height':1, 'width':'100%', 'display':'block'});
333 iframe.attr('frameborder', 0);
333 iframe.attr('frameborder', 0);
334 iframe.attr('scrolling', 'auto');
334 iframe.attr('scrolling', 'auto');
335
335
336 // Once the iframe is loaded, the subarea is dynamically inserted
336 // Once the iframe is loaded, the subarea is dynamically inserted
337 iframe.on('load', function() {
337 iframe.on('load', function() {
338 // Workaround needed by Firefox, to properly render svg inside
338 // Workaround needed by Firefox, to properly render svg inside
339 // iframes, see http://stackoverflow.com/questions/10177190/
339 // iframes, see http://stackoverflow.com/questions/10177190/
340 // svg-dynamically-added-to-iframe-does-not-render-correctly
340 // svg-dynamically-added-to-iframe-does-not-render-correctly
341 this.contentDocument.open();
341 this.contentDocument.open();
342
342
343 // Insert the subarea into the iframe
343 // Insert the subarea into the iframe
344 // We must directly write the html. When using Jquery's append
344 // We must directly write the html. When using Jquery's append
345 // method, javascript is evaluated in the parent document and
345 // method, javascript is evaluated in the parent document and
346 // not in the iframe document. At this point, subarea doesn't
346 // not in the iframe document. At this point, subarea doesn't
347 // contain any user content.
347 // contain any user content.
348 this.contentDocument.write(subarea.html());
348 this.contentDocument.write(subarea.html());
349
349
350 this.contentDocument.close();
350 this.contentDocument.close();
351
351
352 var body = this.contentDocument.body;
352 var body = this.contentDocument.body;
353 // Adjust the iframe height automatically
353 // Adjust the iframe height automatically
354 iframe.height(body.scrollHeight + 'px');
354 iframe.height(body.scrollHeight + 'px');
355 });
355 });
356
356
357 // Elements should be appended to the inner subarea and not to the
357 // Elements should be appended to the inner subarea and not to the
358 // iframe
358 // iframe
359 iframe.append = function(that) {
359 iframe.append = function(that) {
360 subarea.append(that);
360 subarea.append(that);
361 };
361 };
362
362
363 return iframe;
363 return iframe;
364 } else {
364 } else {
365 return subarea;
365 return subarea;
366 }
366 }
367 }
367 }
368
368
369
369
370 OutputArea.prototype._append_javascript_error = function (err, element) {
370 OutputArea.prototype._append_javascript_error = function (err, element) {
371 // display a message when a javascript error occurs in display output
371 // display a message when a javascript error occurs in display output
372 var msg = "Javascript error adding output!"
372 var msg = "Javascript error adding output!"
373 if ( element === undefined ) return;
373 if ( element === undefined ) return;
374 element
374 element
375 .append($('<div/>').text(msg).addClass('js-error'))
375 .append($('<div/>').text(msg).addClass('js-error'))
376 .append($('<div/>').text(err.toString()).addClass('js-error'))
376 .append($('<div/>').text(err.toString()).addClass('js-error'))
377 .append($('<div/>').text('See your browser Javascript console for more details.').addClass('js-error'));
377 .append($('<div/>').text('See your browser Javascript console for more details.').addClass('js-error'));
378 };
378 };
379
379
380 OutputArea.prototype._safe_append = function (toinsert) {
380 OutputArea.prototype._safe_append = function (toinsert) {
381 // safely append an item to the document
381 // safely append an item to the document
382 // this is an object created by user code,
382 // this is an object created by user code,
383 // and may have errors, which should not be raised
383 // and may have errors, which should not be raised
384 // under any circumstances.
384 // under any circumstances.
385 try {
385 try {
386 this.element.append(toinsert);
386 this.element.append(toinsert);
387 } catch(err) {
387 } catch(err) {
388 console.log(err);
388 console.log(err);
389 // Create an actual output_area and output_subarea, which creates
389 // Create an actual output_area and output_subarea, which creates
390 // the prompt area and the proper indentation.
390 // the prompt area and the proper indentation.
391 var toinsert = this.create_output_area();
391 var toinsert = this.create_output_area();
392 var subarea = $('<div/>').addClass('output_subarea');
392 var subarea = $('<div/>').addClass('output_subarea');
393 toinsert.append(subarea);
393 toinsert.append(subarea);
394 this._append_javascript_error(err, subarea);
394 this._append_javascript_error(err, subarea);
395 this.element.append(toinsert);
395 this.element.append(toinsert);
396 }
396 }
397 };
397 };
398
398
399
399
400 OutputArea.prototype.append_pyout = function (json) {
400 OutputArea.prototype.append_pyout = function (json) {
401 var n = json.prompt_number || ' ';
401 var n = json.prompt_number || ' ';
402 var toinsert = this.create_output_area();
402 var toinsert = this.create_output_area();
403 if (this.prompt_area) {
403 if (this.prompt_area) {
404 toinsert.find('div.prompt').addClass('output_prompt').text('Out[' + n + ']:');
404 toinsert.find('div.prompt').addClass('output_prompt').text('Out[' + n + ']:');
405 }
405 }
406 var inserted = this.append_mime_type(json, toinsert);
406 var inserted = this.append_mime_type(json, toinsert);
407 if (inserted) {
407 if (inserted) {
408 inserted.addClass('output_pyout');
408 inserted.addClass('output_pyout');
409 }
409 }
410 this._safe_append(toinsert);
410 this._safe_append(toinsert);
411 // If we just output latex, typeset it.
411 // If we just output latex, typeset it.
412 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
412 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
413 this.typeset();
413 this.typeset();
414 }
414 }
415 };
415 };
416
416
417
417
418 OutputArea.prototype.append_pyerr = function (json) {
418 OutputArea.prototype.append_pyerr = function (json) {
419 var tb = json.traceback;
419 var tb = json.traceback;
420 if (tb !== undefined && tb.length > 0) {
420 if (tb !== undefined && tb.length > 0) {
421 var s = '';
421 var s = '';
422 var len = tb.length;
422 var len = tb.length;
423 for (var i=0; i<len; i++) {
423 for (var i=0; i<len; i++) {
424 s = s + tb[i] + '\n';
424 s = s + tb[i] + '\n';
425 }
425 }
426 s = s + '\n';
426 s = s + '\n';
427 var toinsert = this.create_output_area();
427 var toinsert = this.create_output_area();
428 var append_text = OutputArea.append_map['text/plain'];
428 var append_text = OutputArea.append_map['text/plain'];
429 if (append_text) {
429 if (append_text) {
430 append_text.apply(this, [s, {}, toinsert]).addClass('output_pyerr');
430 append_text.apply(this, [s, {}, toinsert]).addClass('output_pyerr');
431 }
431 }
432 this._safe_append(toinsert);
432 this._safe_append(toinsert);
433 }
433 }
434 };
434 };
435
435
436
436
437 OutputArea.prototype.append_stream = function (json) {
437 OutputArea.prototype.append_stream = function (json) {
438 // temporary fix: if stream undefined (json file written prior to this patch),
438 // temporary fix: if stream undefined (json file written prior to this patch),
439 // default to most likely stdout:
439 // default to most likely stdout:
440 if (json.stream === undefined){
440 if (json.stream === undefined){
441 json.stream = 'stdout';
441 json.stream = 'stdout';
442 }
442 }
443 var text = json.text;
443 var text = json.text;
444 var subclass = "output_"+json.stream;
444 var subclass = "output_"+json.stream;
445 if (this.outputs.length > 0){
445 if (this.outputs.length > 0){
446 // have at least one output to consider
446 // have at least one output to consider
447 var last = this.outputs[this.outputs.length-1];
447 var last = this.outputs[this.outputs.length-1];
448 if (last.output_type == 'stream' && json.stream == last.stream){
448 if (last.output_type == 'stream' && json.stream == last.stream){
449 // latest output was in the same stream,
449 // latest output was in the same stream,
450 // so append directly into its pre tag
450 // so append directly into its pre tag
451 // escape ANSI & HTML specials:
451 // escape ANSI & HTML specials:
452 var pre = this.element.find('div.'+subclass).last().find('pre');
452 var pre = this.element.find('div.'+subclass).last().find('pre');
453 var html = utils.fixCarriageReturn(
453 var html = utils.fixCarriageReturn(
454 pre.html() + utils.fixConsole(text));
454 pre.html() + utils.fixConsole(text));
455 // The only user content injected with this HTML call is
455 // The only user content injected with this HTML call is
456 // escaped by the fixConsole() method.
456 // escaped by the fixConsole() method.
457 pre.html(html);
457 pre.html(html);
458 return;
458 return;
459 }
459 }
460 }
460 }
461
461
462 if (!text.replace("\r", "")) {
462 if (!text.replace("\r", "")) {
463 // text is nothing (empty string, \r, etc.)
463 // text is nothing (empty string, \r, etc.)
464 // so don't append any elements, which might add undesirable space
464 // so don't append any elements, which might add undesirable space
465 return;
465 return;
466 }
466 }
467
467
468 // If we got here, attach a new div
468 // If we got here, attach a new div
469 var toinsert = this.create_output_area();
469 var toinsert = this.create_output_area();
470 var append_text = OutputArea.append_map['text/plain'];
470 var append_text = OutputArea.append_map['text/plain'];
471 if (append_text) {
471 if (append_text) {
472 append_text.apply(this, [text, {}, toinsert]).addClass("output_stream " + subclass);
472 append_text.apply(this, [text, {}, toinsert]).addClass("output_stream " + subclass);
473 }
473 }
474 this._safe_append(toinsert);
474 this._safe_append(toinsert);
475 };
475 };
476
476
477
477
478 OutputArea.prototype.append_display_data = function (json) {
478 OutputArea.prototype.append_display_data = function (json) {
479 var toinsert = this.create_output_area();
479 var toinsert = this.create_output_area();
480 if (this.append_mime_type(json, toinsert)) {
480 if (this.append_mime_type(json, toinsert)) {
481 this._safe_append(toinsert);
481 this._safe_append(toinsert);
482 // If we just output latex, typeset it.
482 // If we just output latex, typeset it.
483 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
483 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
484 this.typeset();
484 this.typeset();
485 }
485 }
486 }
486 }
487 };
487 };
488
488
489
489
490 OutputArea.safe_outputs = {
490 OutputArea.safe_outputs = {
491 'text/plain' : true,
491 'text/plain' : true,
492 'text/latex' : true,
492 'text/latex' : true,
493 'image/png' : true,
493 'image/png' : true,
494 'image/jpeg' : true
494 'image/jpeg' : true
495 };
495 };
496
496
497 OutputArea.prototype.append_mime_type = function (json, element) {
497 OutputArea.prototype.append_mime_type = function (json, element) {
498 for (var type_i in OutputArea.display_order) {
498 for (var type_i in OutputArea.display_order) {
499 var type = OutputArea.display_order[type_i];
499 var type = OutputArea.display_order[type_i];
500 var append = OutputArea.append_map[type];
500 var append = OutputArea.append_map[type];
501 if ((json[type] !== undefined) && append) {
501 if ((json[type] !== undefined) && append) {
502 var value = json[type];
502 var value = json[type];
503 if (!this.trusted && !OutputArea.safe_outputs[type]) {
503 if (!this.trusted && !OutputArea.safe_outputs[type]) {
504 // not trusted, sanitize HTML
504 // not trusted, sanitize HTML
505 if (type==='text/html' || type==='text/svg') {
505 if (type==='text/html' || type==='text/svg') {
506 value = IPython.security.sanitize_html(value);
506 value = IPython.security.sanitize_html(value);
507 } else {
507 } else {
508 // don't display if we don't know how to sanitize it
508 // don't display if we don't know how to sanitize it
509 console.log("Ignoring untrusted " + type + " output.");
509 console.log("Ignoring untrusted " + type + " output.");
510 continue;
510 continue;
511 }
511 }
512 }
512 }
513 var md = json.metadata || {};
513 var md = json.metadata || {};
514 var toinsert = append.apply(this, [value, md, element]);
514 var toinsert = append.apply(this, [value, md, element]);
515 $([IPython.events]).trigger('output_appended.OutputArea', [type, value, md, toinsert]);
515 $([IPython.events]).trigger('output_appended.OutputArea', [type, value, md, toinsert]);
516 return toinsert;
516 return toinsert;
517 }
517 }
518 }
518 }
519 return null;
519 return null;
520 };
520 };
521
521
522
522
523 var append_html = function (html, md, element) {
523 var append_html = function (html, md, element) {
524 var type = 'text/html';
524 var type = 'text/html';
525 var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
525 var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
526 IPython.keyboard_manager.register_events(toinsert);
526 IPython.keyboard_manager.register_events(toinsert);
527 toinsert.append(html);
527 toinsert.append(html);
528 element.append(toinsert);
528 element.append(toinsert);
529 return toinsert;
529 return toinsert;
530 };
530 };
531
531
532
532
533 var append_javascript = function (js, md, element) {
533 var append_javascript = function (js, md, element) {
534 // We just eval the JS code, element appears in the local scope.
534 // We just eval the JS code, element appears in the local scope.
535 var type = 'application/javascript';
535 var type = 'application/javascript';
536 var toinsert = this.create_output_subarea(md, "output_javascript", type);
536 var toinsert = this.create_output_subarea(md, "output_javascript", type);
537 IPython.keyboard_manager.register_events(toinsert);
537 IPython.keyboard_manager.register_events(toinsert);
538 element.append(toinsert);
538 element.append(toinsert);
539 // FIXME TODO : remove `container element for 3.0`
539 // FIXME TODO : remove `container element for 3.0`
540 //backward compat, js should be eval'ed in a context where `container` is defined.
540 //backward compat, js should be eval'ed in a context where `container` is defined.
541 var container = element;
541 var container = element;
542 container.show = function(){console.log('Warning "container.show()" is deprecated.')};
542 container.show = function(){console.log('Warning "container.show()" is deprecated.')};
543 // end backward compat
543 // end backward compat
544 try {
544 try {
545 eval(js);
545 eval(js);
546 } catch(err) {
546 } catch(err) {
547 console.log(err);
547 console.log(err);
548 this._append_javascript_error(err, toinsert);
548 this._append_javascript_error(err, toinsert);
549 }
549 }
550 return toinsert;
550 return toinsert;
551 };
551 };
552
552
553
553
554 var append_text = function (data, md, element) {
554 var append_text = function (data, md, element) {
555 var type = 'text/plain';
555 var type = 'text/plain';
556 var toinsert = this.create_output_subarea(md, "output_text", type);
556 var toinsert = this.create_output_subarea(md, "output_text", type);
557 // escape ANSI & HTML specials in plaintext:
557 // escape ANSI & HTML specials in plaintext:
558 data = utils.fixConsole(data);
558 data = utils.fixConsole(data);
559 data = utils.fixCarriageReturn(data);
559 data = utils.fixCarriageReturn(data);
560 data = utils.autoLinkUrls(data);
560 data = utils.autoLinkUrls(data);
561 // The only user content injected with this HTML call is
561 // The only user content injected with this HTML call is
562 // escaped by the fixConsole() method.
562 // escaped by the fixConsole() method.
563 toinsert.append($("<pre/>").html(data));
563 toinsert.append($("<pre/>").html(data));
564 element.append(toinsert);
564 element.append(toinsert);
565 return toinsert;
565 return toinsert;
566 };
566 };
567
567
568
568
569 var append_svg = function (svg, md, element) {
569 var append_svg = function (svg, md, element) {
570 var type = 'image/svg+xml';
570 var type = 'image/svg+xml';
571 var toinsert = this.create_output_subarea(md, "output_svg", type);
571 var toinsert = this.create_output_subarea(md, "output_svg", type);
572 toinsert.append(svg);
572 toinsert.append(svg);
573 element.append(toinsert);
573 element.append(toinsert);
574 return toinsert;
574 return toinsert;
575 };
575 };
576
576
577
577
578 OutputArea.prototype._dblclick_to_reset_size = function (img) {
578 OutputArea.prototype._dblclick_to_reset_size = function (img) {
579 // wrap image after it's loaded on the page,
579 // wrap image after it's loaded on the page,
580 // otherwise the measured initial size will be incorrect
580 // otherwise the measured initial size will be incorrect
581 img.on("load", function (){
581 img.on("load", function (){
582 var h0 = img.height();
582 var h0 = img.height();
583 var w0 = img.width();
583 var w0 = img.width();
584 if (!(h0 && w0)) {
584 if (!(h0 && w0)) {
585 // zero size, don't make it resizable
585 // zero size, don't make it resizable
586 return;
586 return;
587 }
587 }
588 img.resizable({
588 img.resizable({
589 aspectRatio: true,
589 aspectRatio: true,
590 autoHide: true
590 autoHide: true
591 });
591 });
592 img.dblclick(function () {
592 img.dblclick(function () {
593 // resize wrapper & image together for some reason:
593 // resize wrapper & image together for some reason:
594 img.parent().height(h0);
594 img.parent().height(h0);
595 img.height(h0);
595 img.height(h0);
596 img.parent().width(w0);
596 img.parent().width(w0);
597 img.width(w0);
597 img.width(w0);
598 });
598 });
599 });
599 });
600 };
600 };
601
601
602 var set_width_height = function (img, md, mime) {
602 var set_width_height = function (img, md, mime) {
603 // set width and height of an img element from metadata
603 // set width and height of an img element from metadata
604 var height = _get_metadata_key(md, 'height', mime);
604 var height = _get_metadata_key(md, 'height', mime);
605 if (height !== undefined) img.attr('height', height);
605 if (height !== undefined) img.attr('height', height);
606 var width = _get_metadata_key(md, 'width', mime);
606 var width = _get_metadata_key(md, 'width', mime);
607 if (width !== undefined) img.attr('width', width);
607 if (width !== undefined) img.attr('width', width);
608 };
608 };
609
609
610 var append_png = function (png, md, element) {
610 var append_png = function (png, md, element) {
611 var type = 'image/png';
611 var type = 'image/png';
612 var toinsert = this.create_output_subarea(md, "output_png", type);
612 var toinsert = this.create_output_subarea(md, "output_png", type);
613 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
613 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
614 set_width_height(img, md, 'image/png');
614 set_width_height(img, md, 'image/png');
615 this._dblclick_to_reset_size(img);
615 this._dblclick_to_reset_size(img);
616 toinsert.append(img);
616 toinsert.append(img);
617 element.append(toinsert);
617 element.append(toinsert);
618 return toinsert;
618 return toinsert;
619 };
619 };
620
620
621
621
622 var append_jpeg = function (jpeg, md, element) {
622 var append_jpeg = function (jpeg, md, element) {
623 var type = 'image/jpeg';
623 var type = 'image/jpeg';
624 var toinsert = this.create_output_subarea(md, "output_jpeg", type);
624 var toinsert = this.create_output_subarea(md, "output_jpeg", type);
625 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
625 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
626 set_width_height(img, md, 'image/jpeg');
626 set_width_height(img, md, 'image/jpeg');
627 this._dblclick_to_reset_size(img);
627 this._dblclick_to_reset_size(img);
628 toinsert.append(img);
628 toinsert.append(img);
629 element.append(toinsert);
629 element.append(toinsert);
630 return toinsert;
630 return toinsert;
631 };
631 };
632
632
633
633
634 var append_pdf = function (pdf, md, element) {
634 var append_pdf = function (pdf, md, element) {
635 var type = 'application/pdf';
635 var type = 'application/pdf';
636 var toinsert = this.create_output_subarea(md, "output_pdf", type);
636 var toinsert = this.create_output_subarea(md, "output_pdf", type);
637 var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
637 var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
638 a.attr('target', '_blank');
638 a.attr('target', '_blank');
639 a.text('View PDF')
639 a.text('View PDF')
640 toinsert.append(a);
640 toinsert.append(a);
641 element.append(toinsert);
641 element.append(toinsert);
642 return toinsert;
642 return toinsert;
643 }
643 }
644
644
645 var append_latex = function (latex, md, element) {
645 var append_latex = function (latex, md, element) {
646 // This method cannot do the typesetting because the latex first has to
646 // This method cannot do the typesetting because the latex first has to
647 // be on the page.
647 // be on the page.
648 var type = 'text/latex';
648 var type = 'text/latex';
649 var toinsert = this.create_output_subarea(md, "output_latex", type);
649 var toinsert = this.create_output_subarea(md, "output_latex", type);
650 toinsert.append(latex);
650 toinsert.append(latex);
651 element.append(toinsert);
651 element.append(toinsert);
652 return toinsert;
652 return toinsert;
653 };
653 };
654
654
655
655
656 OutputArea.prototype.append_raw_input = function (msg) {
656 OutputArea.prototype.append_raw_input = function (msg) {
657 var that = this;
657 var that = this;
658 this.expand();
658 this.expand();
659 var content = msg.content;
659 var content = msg.content;
660 var area = this.create_output_area();
660 var area = this.create_output_area();
661
661
662 // disable any other raw_inputs, if they are left around
662 // disable any other raw_inputs, if they are left around
663 $("div.output_subarea.raw_input").remove();
663 $("div.output_subarea.raw_input_container").remove();
664
664
665 area.append(
665 area.append(
666 $("<div/>")
666 $("<div/>")
667 .addClass("box-flex1 output_subarea raw_input")
667 .addClass("box-flex1 output_subarea raw_input_container")
668 .append(
668 .append(
669 $("<span/>")
669 $("<span/>")
670 .addClass("input_prompt")
670 .addClass("raw_input_prompt")
671 .text(content.prompt)
671 .text(content.prompt)
672 )
672 )
673 .append(
673 .append(
674 $("<input/>")
674 $("<input/>")
675 .addClass("raw_input")
675 .addClass("raw_input")
676 .attr('type', 'text')
676 .attr('type', 'text')
677 .attr("size", 47)
677 .attr("size", 47)
678 .keydown(function (event, ui) {
678 .keydown(function (event, ui) {
679 // make sure we submit on enter,
679 // make sure we submit on enter,
680 // and don't re-execute the *cell* on shift-enter
680 // and don't re-execute the *cell* on shift-enter
681 if (event.which === IPython.keyboard.keycodes.enter) {
681 if (event.which === IPython.keyboard.keycodes.enter) {
682 that._submit_raw_input();
682 that._submit_raw_input();
683 return false;
683 return false;
684 }
684 }
685 })
685 })
686 )
686 )
687 );
687 );
688
688
689 this.element.append(area);
689 this.element.append(area);
690 var raw_input = area.find('input.raw_input');
690 var raw_input = area.find('input.raw_input');
691 // Register events that enable/disable the keyboard manager while raw
691 // Register events that enable/disable the keyboard manager while raw
692 // input is focused.
692 // input is focused.
693 IPython.keyboard_manager.register_events(raw_input);
693 IPython.keyboard_manager.register_events(raw_input);
694 // Note, the following line used to read raw_input.focus().focus().
694 // Note, the following line used to read raw_input.focus().focus().
695 // This seemed to be needed otherwise only the cell would be focused.
695 // This seemed to be needed otherwise only the cell would be focused.
696 // But with the modal UI, this seems to work fine with one call to focus().
696 // But with the modal UI, this seems to work fine with one call to focus().
697 raw_input.focus();
697 raw_input.focus();
698 }
698 }
699
699
700 OutputArea.prototype._submit_raw_input = function (evt) {
700 OutputArea.prototype._submit_raw_input = function (evt) {
701 var container = this.element.find("div.raw_input");
701 var container = this.element.find("div.raw_input_container");
702 var theprompt = container.find("span.input_prompt");
702 var theprompt = container.find("span.raw_input_prompt");
703 var theinput = container.find("input.raw_input");
703 var theinput = container.find("input.raw_input");
704 var value = theinput.val();
704 var value = theinput.val();
705 var content = {
705 var content = {
706 output_type : 'stream',
706 output_type : 'stream',
707 name : 'stdout',
707 name : 'stdout',
708 text : theprompt.text() + value + '\n'
708 text : theprompt.text() + value + '\n'
709 }
709 }
710 // remove form container
710 // remove form container
711 container.parent().remove();
711 container.parent().remove();
712 // replace with plaintext version in stdout
712 // replace with plaintext version in stdout
713 this.append_output(content, false);
713 this.append_output(content, false);
714 $([IPython.events]).trigger('send_input_reply.Kernel', value);
714 $([IPython.events]).trigger('send_input_reply.Kernel', value);
715 }
715 }
716
716
717
717
718 OutputArea.prototype.handle_clear_output = function (msg) {
718 OutputArea.prototype.handle_clear_output = function (msg) {
719 // msg spec v4 had stdout, stderr, display keys
719 // msg spec v4 had stdout, stderr, display keys
720 // v4.1 replaced these with just wait
720 // v4.1 replaced these with just wait
721 // The default behavior is the same (stdout=stderr=display=True, wait=False),
721 // The default behavior is the same (stdout=stderr=display=True, wait=False),
722 // so v4 messages will still be properly handled,
722 // so v4 messages will still be properly handled,
723 // except for the rarely used clearing less than all output.
723 // except for the rarely used clearing less than all output.
724 this.clear_output(msg.content.wait || false);
724 this.clear_output(msg.content.wait || false);
725 };
725 };
726
726
727
727
728 OutputArea.prototype.clear_output = function(wait) {
728 OutputArea.prototype.clear_output = function(wait) {
729 if (wait) {
729 if (wait) {
730
730
731 // If a clear is queued, clear before adding another to the queue.
731 // If a clear is queued, clear before adding another to the queue.
732 if (this.clear_queued) {
732 if (this.clear_queued) {
733 this.clear_output(false);
733 this.clear_output(false);
734 };
734 };
735
735
736 this.clear_queued = true;
736 this.clear_queued = true;
737 } else {
737 } else {
738
738
739 // Fix the output div's height if the clear_output is waiting for
739 // Fix the output div's height if the clear_output is waiting for
740 // new output (it is being used in an animation).
740 // new output (it is being used in an animation).
741 if (this.clear_queued) {
741 if (this.clear_queued) {
742 var height = this.element.height();
742 var height = this.element.height();
743 this.element.height(height);
743 this.element.height(height);
744 this.clear_queued = false;
744 this.clear_queued = false;
745 }
745 }
746
746
747 // clear all, no need for logic
747 // clear all, no need for logic
748 this.element.html("");
748 this.element.html("");
749 this.outputs = [];
749 this.outputs = [];
750 this.trusted = true;
750 this.trusted = true;
751 this.unscroll_area();
751 this.unscroll_area();
752 return;
752 return;
753 };
753 };
754 };
754 };
755
755
756
756
757 // JSON serialization
757 // JSON serialization
758
758
759 OutputArea.prototype.fromJSON = function (outputs) {
759 OutputArea.prototype.fromJSON = function (outputs) {
760 var len = outputs.length;
760 var len = outputs.length;
761 var data;
761 var data;
762
762
763 for (var i=0; i<len; i++) {
763 for (var i=0; i<len; i++) {
764 data = outputs[i];
764 data = outputs[i];
765 var msg_type = data.output_type;
765 var msg_type = data.output_type;
766 if (msg_type === "display_data" || msg_type === "pyout") {
766 if (msg_type === "display_data" || msg_type === "pyout") {
767 // convert short keys to mime keys
767 // convert short keys to mime keys
768 // TODO: remove mapping of short keys when we update to nbformat 4
768 // TODO: remove mapping of short keys when we update to nbformat 4
769 data = this.rename_keys(data, OutputArea.mime_map_r);
769 data = this.rename_keys(data, OutputArea.mime_map_r);
770 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map_r);
770 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map_r);
771 }
771 }
772
772
773 this.append_output(data);
773 this.append_output(data);
774 }
774 }
775 };
775 };
776
776
777
777
778 OutputArea.prototype.toJSON = function () {
778 OutputArea.prototype.toJSON = function () {
779 var outputs = [];
779 var outputs = [];
780 var len = this.outputs.length;
780 var len = this.outputs.length;
781 var data;
781 var data;
782 for (var i=0; i<len; i++) {
782 for (var i=0; i<len; i++) {
783 data = this.outputs[i];
783 data = this.outputs[i];
784 var msg_type = data.output_type;
784 var msg_type = data.output_type;
785 if (msg_type === "display_data" || msg_type === "pyout") {
785 if (msg_type === "display_data" || msg_type === "pyout") {
786 // convert mime keys to short keys
786 // convert mime keys to short keys
787 data = this.rename_keys(data, OutputArea.mime_map);
787 data = this.rename_keys(data, OutputArea.mime_map);
788 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map);
788 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map);
789 }
789 }
790 outputs[i] = data;
790 outputs[i] = data;
791 }
791 }
792 return outputs;
792 return outputs;
793 };
793 };
794
794
795 /**
795 /**
796 * Class properties
796 * Class properties
797 **/
797 **/
798
798
799 /**
799 /**
800 * Threshold to trigger autoscroll when the OutputArea is resized,
800 * Threshold to trigger autoscroll when the OutputArea is resized,
801 * typically when new outputs are added.
801 * typically when new outputs are added.
802 *
802 *
803 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
803 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
804 * unless it is < 0, in which case autoscroll will never be triggered
804 * unless it is < 0, in which case autoscroll will never be triggered
805 *
805 *
806 * @property auto_scroll_threshold
806 * @property auto_scroll_threshold
807 * @type Number
807 * @type Number
808 * @default 100
808 * @default 100
809 *
809 *
810 **/
810 **/
811 OutputArea.auto_scroll_threshold = 100;
811 OutputArea.auto_scroll_threshold = 100;
812
812
813 /**
813 /**
814 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
814 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
815 * shorter than this are never scrolled.
815 * shorter than this are never scrolled.
816 *
816 *
817 * @property minimum_scroll_threshold
817 * @property minimum_scroll_threshold
818 * @type Number
818 * @type Number
819 * @default 20
819 * @default 20
820 *
820 *
821 **/
821 **/
822 OutputArea.minimum_scroll_threshold = 20;
822 OutputArea.minimum_scroll_threshold = 20;
823
823
824
824
825
825
826 OutputArea.mime_map = {
826 OutputArea.mime_map = {
827 "text/plain" : "text",
827 "text/plain" : "text",
828 "text/html" : "html",
828 "text/html" : "html",
829 "image/svg+xml" : "svg",
829 "image/svg+xml" : "svg",
830 "image/png" : "png",
830 "image/png" : "png",
831 "image/jpeg" : "jpeg",
831 "image/jpeg" : "jpeg",
832 "text/latex" : "latex",
832 "text/latex" : "latex",
833 "application/json" : "json",
833 "application/json" : "json",
834 "application/javascript" : "javascript",
834 "application/javascript" : "javascript",
835 };
835 };
836
836
837 OutputArea.mime_map_r = {
837 OutputArea.mime_map_r = {
838 "text" : "text/plain",
838 "text" : "text/plain",
839 "html" : "text/html",
839 "html" : "text/html",
840 "svg" : "image/svg+xml",
840 "svg" : "image/svg+xml",
841 "png" : "image/png",
841 "png" : "image/png",
842 "jpeg" : "image/jpeg",
842 "jpeg" : "image/jpeg",
843 "latex" : "text/latex",
843 "latex" : "text/latex",
844 "json" : "application/json",
844 "json" : "application/json",
845 "javascript" : "application/javascript",
845 "javascript" : "application/javascript",
846 };
846 };
847
847
848 OutputArea.display_order = [
848 OutputArea.display_order = [
849 'application/javascript',
849 'application/javascript',
850 'text/html',
850 'text/html',
851 'text/latex',
851 'text/latex',
852 'image/svg+xml',
852 'image/svg+xml',
853 'image/png',
853 'image/png',
854 'image/jpeg',
854 'image/jpeg',
855 'application/pdf',
855 'application/pdf',
856 'text/plain'
856 'text/plain'
857 ];
857 ];
858
858
859 OutputArea.append_map = {
859 OutputArea.append_map = {
860 "text/plain" : append_text,
860 "text/plain" : append_text,
861 "text/html" : append_html,
861 "text/html" : append_html,
862 "image/svg+xml" : append_svg,
862 "image/svg+xml" : append_svg,
863 "image/png" : append_png,
863 "image/png" : append_png,
864 "image/jpeg" : append_jpeg,
864 "image/jpeg" : append_jpeg,
865 "text/latex" : append_latex,
865 "text/latex" : append_latex,
866 "application/javascript" : append_javascript,
866 "application/javascript" : append_javascript,
867 "application/pdf" : append_pdf
867 "application/pdf" : append_pdf
868 };
868 };
869
869
870 IPython.OutputArea = OutputArea;
870 IPython.OutputArea = OutputArea;
871
871
872 return IPython;
872 return IPython;
873
873
874 }(IPython));
874 }(IPython));
General Comments 0
You need to be logged in to leave comments. Login now