##// END OF EJS Templates
Fixed rebase issues
Jonathan Frederic -
Show More
@@ -1,886 +1,886
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 this.append_mime_type(json, toinsert, 'output_pyout');
406 this.append_mime_type(json, toinsert, 'output_pyout');
407 this._safe_append(toinsert);
407 this._safe_append(toinsert);
408 // If we just output latex, typeset it.
408 // If we just output latex, typeset it.
409 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
409 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
410 this.typeset();
410 this.typeset();
411 }
411 }
412 };
412 };
413
413
414
414
415 OutputArea.prototype.append_pyerr = function (json) {
415 OutputArea.prototype.append_pyerr = function (json) {
416 var tb = json.traceback;
416 var tb = json.traceback;
417 if (tb !== undefined && tb.length > 0) {
417 if (tb !== undefined && tb.length > 0) {
418 var s = '';
418 var s = '';
419 var len = tb.length;
419 var len = tb.length;
420 for (var i=0; i<len; i++) {
420 for (var i=0; i<len; i++) {
421 s = s + tb[i] + '\n';
421 s = s + tb[i] + '\n';
422 }
422 }
423 s = s + '\n';
423 s = s + '\n';
424 var toinsert = this.create_output_area();
424 var toinsert = this.create_output_area();
425 this.append_text(s, {}, toinsert, 'output_pyerr');
425 this.append_text(s, {}, toinsert, 'output_pyerr');
426 this._safe_append(toinsert);
426 this._safe_append(toinsert);
427 }
427 }
428 };
428 };
429
429
430
430
431 OutputArea.prototype.append_stream = function (json) {
431 OutputArea.prototype.append_stream = function (json) {
432 // temporary fix: if stream undefined (json file written prior to this patch),
432 // temporary fix: if stream undefined (json file written prior to this patch),
433 // default to most likely stdout:
433 // default to most likely stdout:
434 if (json.stream == undefined){
434 if (json.stream == undefined){
435 json.stream = 'stdout';
435 json.stream = 'stdout';
436 }
436 }
437 var text = json.text;
437 var text = json.text;
438 var subclass = "output_"+json.stream;
438 var subclass = "output_"+json.stream;
439 if (this.outputs.length > 0){
439 if (this.outputs.length > 0){
440 // have at least one output to consider
440 // have at least one output to consider
441 var last = this.outputs[this.outputs.length-1];
441 var last = this.outputs[this.outputs.length-1];
442 if (last.output_type == 'stream' && json.stream == last.stream){
442 if (last.output_type == 'stream' && json.stream == last.stream){
443 // latest output was in the same stream,
443 // latest output was in the same stream,
444 // so append directly into its pre tag
444 // so append directly into its pre tag
445 // escape ANSI & HTML specials:
445 // escape ANSI & HTML specials:
446 var pre = this.element.find('div.'+subclass).last().find('pre');
446 var pre = this.element.find('div.'+subclass).last().find('pre');
447 var html = utils.fixCarriageReturn(
447 var html = utils.fixCarriageReturn(
448 pre.html() + utils.fixConsole(text));
448 pre.html() + utils.fixConsole(text));
449 // The only user content injected with this HTML call is
449 // The only user content injected with this HTML call is
450 // escaped by the fixConsole() method.
450 // escaped by the fixConsole() method.
451 pre.html(html);
451 pre.html(html);
452 return;
452 return;
453 }
453 }
454 }
454 }
455
455
456 if (!text.replace("\r", "")) {
456 if (!text.replace("\r", "")) {
457 // text is nothing (empty string, \r, etc.)
457 // text is nothing (empty string, \r, etc.)
458 // so don't append any elements, which might add undesirable space
458 // so don't append any elements, which might add undesirable space
459 return;
459 return;
460 }
460 }
461
461
462 // If we got here, attach a new div
462 // If we got here, attach a new div
463 var toinsert = this.create_output_area();
463 var toinsert = this.create_output_area();
464 this.append_text(text, {}, toinsert, "output_stream "+subclass);
464 this.append_text(text, {}, toinsert, "output_stream "+subclass);
465 this._safe_append(toinsert);
465 this._safe_append(toinsert);
466 };
466 };
467
467
468
468
469 OutputArea.prototype.append_display_data = function (json) {
469 OutputArea.prototype.append_display_data = function (json) {
470 var toinsert = this.create_output_area();
470 var toinsert = this.create_output_area();
471 if (this.append_mime_type(json, toinsert)) {
471 if (this.append_mime_type(json, toinsert)) {
472 this._safe_append(toinsert);
472 this._safe_append(toinsert);
473 // If we just output latex, typeset it.
473 // If we just output latex, typeset it.
474 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
474 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
475 this.typeset();
475 this.typeset();
476 }
476 }
477 }
477 }
478 };
478 };
479
479
480
480
481 OutputArea.safe_outputs = {
481 OutputArea.safe_outputs = {
482 'text/plain' : true,
482 'text/plain' : true,
483 'text/latex' : true,
483 'text/latex' : true,
484 'image/png' : true,
484 'image/png' : true,
485 'image/jpeg' : true
485 'image/jpeg' : true
486 };
486 };
487
487
488 OutputArea.prototype.append_mime_type = function (json, element) {
488 OutputArea.prototype.append_mime_type = function (json, element, extra_class) {
489 for (var type_i in OutputArea.display_order) {
489 for (var type_i in OutputArea.display_order) {
490 var type = OutputArea.display_order[type_i];
490 var type = OutputArea.display_order[type_i];
491 var append = OutputArea.append_map[type];
491 var append = OutputArea.append_map[type];
492 if ((json[type] !== undefined) && append) {
492 if ((json[type] !== undefined) && append) {
493 var value = json[type];
493 var value = json[type];
494 if (!this.trusted && !OutputArea.safe_outputs[type]) {
494 if (!this.trusted && !OutputArea.safe_outputs[type]) {
495 // not trusted, sanitize HTML
495 // not trusted, sanitize HTML
496 if (type==='text/html' || type==='text/svg') {
496 if (type==='text/html' || type==='text/svg') {
497 value = IPython.security.sanitize_html(value);
497 value = IPython.security.sanitize_html(value);
498 } else {
498 } else {
499 // don't display if we don't know how to sanitize it
499 // don't display if we don't know how to sanitize it
500 console.log("Ignoring untrusted " + type + " output.");
500 console.log("Ignoring untrusted " + type + " output.");
501 continue;
501 continue;
502 }
502 }
503 }
503 }
504 var md = json.metadata || {};
504 var md = json.metadata || {};
505 var toinsert = append.apply(this, [value, md, element, extra_class]);
505 var toinsert = append.apply(this, [value, md, element, extra_class]);
506 $([IPython.events]).trigger('output_appended.OutputArea', [type, value, md, toinsert]);
506 $([IPython.events]).trigger('output_appended.OutputArea', [type, value, md, toinsert]);
507 return true;
507 return true;
508 }
508 }
509 }
509 }
510 return false;
510 return false;
511 };
511 };
512
512
513
513
514 OutputArea.prototype.append_html = function (html, md, element, extra_class) {
514 OutputArea.prototype.append_html = function (html, md, element, extra_class) {
515 var type = 'text/html';
515 var type = 'text/html';
516 var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
516 var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
517 if (extra_class){
517 if (extra_class){
518 toinsert.addClass(extra_class);
518 toinsert.addClass(extra_class);
519 }
519 }
520 IPython.keyboard_manager.register_events(toinsert);
520 IPython.keyboard_manager.register_events(toinsert);
521 toinsert.append(html);
521 toinsert.append(html);
522 element.append(toinsert);
522 element.append(toinsert);
523 return toinsert;
523 return toinsert;
524 };
524 };
525
525
526
526
527 OutputArea.prototype.append_javascript = function (js, md, element, extra_class) {
527 OutputArea.prototype.append_javascript = function (js, md, element, extra_class) {
528 // We just eval the JS code, element appears in the local scope.
528 // We just eval the JS code, element appears in the local scope.
529 var type = 'application/javascript';
529 var type = 'application/javascript';
530 var toinsert = this.create_output_subarea(md, "output_javascript", type);
530 var toinsert = this.create_output_subarea(md, "output_javascript", type);
531 if (extra_class){
531 if (extra_class){
532 toinsert.addClass(extra_class);
532 toinsert.addClass(extra_class);
533 }
533 }
534 IPython.keyboard_manager.register_events(toinsert);
534 IPython.keyboard_manager.register_events(toinsert);
535 element.append(toinsert);
535 element.append(toinsert);
536 // FIXME TODO : remove `container element for 3.0`
536 // FIXME TODO : remove `container element for 3.0`
537 //backward compat, js should be eval'ed in a context where `container` is defined.
537 //backward compat, js should be eval'ed in a context where `container` is defined.
538 var container = element;
538 var container = element;
539 container.show = function(){console.log('Warning "container.show()" is deprecated.')};
539 container.show = function(){console.log('Warning "container.show()" is deprecated.')};
540 // end backward compat
540 // end backward compat
541 try {
541 try {
542 eval(js);
542 eval(js);
543 } catch(err) {
543 } catch(err) {
544 console.log(err);
544 console.log(err);
545 this._append_javascript_error(err, toinsert);
545 this._append_javascript_error(err, toinsert);
546 }
546 }
547 return toinsert;
547 return toinsert;
548 };
548 };
549
549
550
550
551 OutputArea.prototype.append_text = function (data, md, element, extra_class) {
551 OutputArea.prototype.append_text = function (data, md, element, extra_class) {
552 var type = 'text/plain';
552 var type = 'text/plain';
553 var toinsert = this.create_output_subarea(md, "output_text", type);
553 var toinsert = this.create_output_subarea(md, "output_text", type);
554 // escape ANSI & HTML specials in plaintext:
554 // escape ANSI & HTML specials in plaintext:
555 data = utils.fixConsole(data);
555 data = utils.fixConsole(data);
556 data = utils.fixCarriageReturn(data);
556 data = utils.fixCarriageReturn(data);
557 data = utils.autoLinkUrls(data);
557 data = utils.autoLinkUrls(data);
558 if (extra_class){
558 if (extra_class){
559 toinsert.addClass(extra_class);
559 toinsert.addClass(extra_class);
560 }
560 }
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 OutputArea.prototype.append_svg = function (svg, md, element, extra_class) {
569 OutputArea.prototype.append_svg = function (svg, md, element, extra_class) {
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 if (extra_class){
572 if (extra_class){
573 toinsert.addClass(extra_class);
573 toinsert.addClass(extra_class);
574 }
574 }
575 toinsert.append(svg);
575 toinsert.append(svg);
576 element.append(toinsert);
576 element.append(toinsert);
577 return toinsert;
577 return toinsert;
578 };
578 };
579
579
580
580
581 OutputArea.prototype._dblclick_to_reset_size = function (img) {
581 OutputArea.prototype._dblclick_to_reset_size = function (img) {
582 // wrap image after it's loaded on the page,
582 // wrap image after it's loaded on the page,
583 // otherwise the measured initial size will be incorrect
583 // otherwise the measured initial size will be incorrect
584 img.on("load", function (){
584 img.on("load", function (){
585 var h0 = img.height();
585 var h0 = img.height();
586 var w0 = img.width();
586 var w0 = img.width();
587 if (!(h0 && w0)) {
587 if (!(h0 && w0)) {
588 // zero size, don't make it resizable
588 // zero size, don't make it resizable
589 return;
589 return;
590 }
590 }
591 img.resizable({
591 img.resizable({
592 aspectRatio: true,
592 aspectRatio: true,
593 autoHide: true
593 autoHide: true
594 });
594 });
595 img.dblclick(function () {
595 img.dblclick(function () {
596 // resize wrapper & image together for some reason:
596 // resize wrapper & image together for some reason:
597 img.parent().height(h0);
597 img.parent().height(h0);
598 img.height(h0);
598 img.height(h0);
599 img.parent().width(w0);
599 img.parent().width(w0);
600 img.width(w0);
600 img.width(w0);
601 });
601 });
602 });
602 });
603 };
603 };
604
604
605 var set_width_height = function (img, md, mime) {
605 var set_width_height = function (img, md, mime) {
606 // set width and height of an img element from metadata
606 // set width and height of an img element from metadata
607 var height = _get_metadata_key(md, 'height', mime);
607 var height = _get_metadata_key(md, 'height', mime);
608 if (height !== undefined) img.attr('height', height);
608 if (height !== undefined) img.attr('height', height);
609 var width = _get_metadata_key(md, 'width', mime);
609 var width = _get_metadata_key(md, 'width', mime);
610 if (width !== undefined) img.attr('width', width);
610 if (width !== undefined) img.attr('width', width);
611 };
611 };
612
612
613 OutputArea.prototype.append_png = function (png, md, element) {
613 OutputArea.prototype.append_png = function (png, md, element) {
614 var type = 'image/png';
614 var type = 'image/png';
615 var toinsert = this.create_output_subarea(md, "output_png", type);
615 var toinsert = this.create_output_subarea(md, "output_png", type);
616 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
616 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
617 set_width_height(img, md, 'image/png');
617 set_width_height(img, md, 'image/png');
618 this._dblclick_to_reset_size(img);
618 this._dblclick_to_reset_size(img);
619 toinsert.append(img);
619 toinsert.append(img);
620 element.append(toinsert);
620 element.append(toinsert);
621 return toinsert;
621 return toinsert;
622 };
622 };
623
623
624
624
625 OutputArea.prototype.append_jpeg = function (jpeg, md, element, extra_class) {
625 OutputArea.prototype.append_jpeg = function (jpeg, md, element, extra_class) {
626 var type = 'image/jpeg';
626 var type = 'image/jpeg';
627 var toinsert = this.create_output_subarea(md, "output_jpeg", type);
627 var toinsert = this.create_output_subarea(md, "output_jpeg", type);
628 if (extra_class){
628 if (extra_class){
629 toinsert.addClass(extra_class);
629 toinsert.addClass(extra_class);
630 }
630 }
631 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
631 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
632 set_width_height(img, md, 'image/jpeg');
632 set_width_height(img, md, 'image/jpeg');
633 this._dblclick_to_reset_size(img);
633 this._dblclick_to_reset_size(img);
634 toinsert.append(img);
634 toinsert.append(img);
635 element.append(toinsert);
635 element.append(toinsert);
636 return toinsert;
636 return toinsert;
637 };
637 };
638
638
639
639
640 OutputArea.prototype.append_pdf = function (pdf, md, element, extra_class) {
640 OutputArea.prototype.append_pdf = function (pdf, md, element, extra_class) {
641 var type = 'application/pdf';
641 var type = 'application/pdf';
642 var toinsert = this.create_output_subarea(md, "output_pdf", type);
642 var toinsert = this.create_output_subarea(md, "output_pdf", type);
643 if (extra_class){
643 if (extra_class){
644 toinsert.addClass(extra_class);
644 toinsert.addClass(extra_class);
645 }
645 }
646 var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
646 var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
647 a.attr('target', '_blank');
647 a.attr('target', '_blank');
648 a.text('View PDF')
648 a.text('View PDF')
649 toinsert.append(a);
649 toinsert.append(a);
650 element.append(toinsert);
650 element.append(toinsert);
651 return toinsert;
651 return toinsert;
652 }
652 }
653
653
654 OutputArea.prototype.append_latex = function (latex, md, element, extra_class) {
654 OutputArea.prototype.append_latex = function (latex, md, element, extra_class) {
655 // This method cannot do the typesetting because the latex first has to
655 // This method cannot do the typesetting because the latex first has to
656 // be on the page.
656 // be on the page.
657 var type = 'text/latex';
657 var type = 'text/latex';
658 var toinsert = this.create_output_subarea(md, "output_latex", type);
658 var toinsert = this.create_output_subarea(md, "output_latex", type);
659 if (extra_class){
659 if (extra_class){
660 toinsert.addClass(extra_class);
660 toinsert.addClass(extra_class);
661 }
661 }
662 toinsert.append(latex);
662 toinsert.append(latex);
663 element.append(toinsert);
663 element.append(toinsert);
664 return toinsert;
664 return toinsert;
665 };
665 };
666
666
667
667
668 OutputArea.prototype.append_raw_input = function (msg) {
668 OutputArea.prototype.append_raw_input = function (msg) {
669 var that = this;
669 var that = this;
670 this.expand();
670 this.expand();
671 var content = msg.content;
671 var content = msg.content;
672 var area = this.create_output_area();
672 var area = this.create_output_area();
673
673
674 // disable any other raw_inputs, if they are left around
674 // disable any other raw_inputs, if they are left around
675 $("div.output_subarea.raw_input").remove();
675 $("div.output_subarea.raw_input").remove();
676
676
677 area.append(
677 area.append(
678 $("<div/>")
678 $("<div/>")
679 .addClass("box-flex1 output_subarea raw_input")
679 .addClass("box-flex1 output_subarea raw_input")
680 .append(
680 .append(
681 $("<span/>")
681 $("<span/>")
682 .addClass("input_prompt")
682 .addClass("input_prompt")
683 .text(content.prompt)
683 .text(content.prompt)
684 )
684 )
685 .append(
685 .append(
686 $("<input/>")
686 $("<input/>")
687 .addClass("raw_input")
687 .addClass("raw_input")
688 .attr('type', 'text')
688 .attr('type', 'text')
689 .attr("size", 47)
689 .attr("size", 47)
690 .keydown(function (event, ui) {
690 .keydown(function (event, ui) {
691 // make sure we submit on enter,
691 // make sure we submit on enter,
692 // and don't re-execute the *cell* on shift-enter
692 // and don't re-execute the *cell* on shift-enter
693 if (event.which === IPython.keyboard.keycodes.enter) {
693 if (event.which === IPython.keyboard.keycodes.enter) {
694 that._submit_raw_input();
694 that._submit_raw_input();
695 return false;
695 return false;
696 }
696 }
697 })
697 })
698 )
698 )
699 );
699 );
700
700
701 this.element.append(area);
701 this.element.append(area);
702 var raw_input = area.find('input.raw_input');
702 var raw_input = area.find('input.raw_input');
703 // Register events that enable/disable the keyboard manager while raw
703 // Register events that enable/disable the keyboard manager while raw
704 // input is focused.
704 // input is focused.
705 IPython.keyboard_manager.register_events(raw_input);
705 IPython.keyboard_manager.register_events(raw_input);
706 // Note, the following line used to read raw_input.focus().focus().
706 // Note, the following line used to read raw_input.focus().focus().
707 // This seemed to be needed otherwise only the cell would be focused.
707 // This seemed to be needed otherwise only the cell would be focused.
708 // But with the modal UI, this seems to work fine with one call to focus().
708 // But with the modal UI, this seems to work fine with one call to focus().
709 raw_input.focus();
709 raw_input.focus();
710 }
710 }
711
711
712 OutputArea.prototype._submit_raw_input = function (evt) {
712 OutputArea.prototype._submit_raw_input = function (evt) {
713 var container = this.element.find("div.raw_input");
713 var container = this.element.find("div.raw_input");
714 var theprompt = container.find("span.input_prompt");
714 var theprompt = container.find("span.input_prompt");
715 var theinput = container.find("input.raw_input");
715 var theinput = container.find("input.raw_input");
716 var value = theinput.val();
716 var value = theinput.val();
717 var content = {
717 var content = {
718 output_type : 'stream',
718 output_type : 'stream',
719 name : 'stdout',
719 name : 'stdout',
720 text : theprompt.text() + value + '\n'
720 text : theprompt.text() + value + '\n'
721 }
721 }
722 // remove form container
722 // remove form container
723 container.parent().remove();
723 container.parent().remove();
724 // replace with plaintext version in stdout
724 // replace with plaintext version in stdout
725 this.append_output(content, false);
725 this.append_output(content, false);
726 $([IPython.events]).trigger('send_input_reply.Kernel', value);
726 $([IPython.events]).trigger('send_input_reply.Kernel', value);
727 }
727 }
728
728
729
729
730 OutputArea.prototype.handle_clear_output = function (msg) {
730 OutputArea.prototype.handle_clear_output = function (msg) {
731 // msg spec v4 had stdout, stderr, display keys
731 // msg spec v4 had stdout, stderr, display keys
732 // v4.1 replaced these with just wait
732 // v4.1 replaced these with just wait
733 // The default behavior is the same (stdout=stderr=display=True, wait=False),
733 // The default behavior is the same (stdout=stderr=display=True, wait=False),
734 // so v4 messages will still be properly handled,
734 // so v4 messages will still be properly handled,
735 // except for the rarely used clearing less than all output.
735 // except for the rarely used clearing less than all output.
736 this.clear_output(msg.content.wait || false);
736 this.clear_output(msg.content.wait || false);
737 };
737 };
738
738
739
739
740 OutputArea.prototype.clear_output = function(wait) {
740 OutputArea.prototype.clear_output = function(wait) {
741 if (wait) {
741 if (wait) {
742
742
743 // If a clear is queued, clear before adding another to the queue.
743 // If a clear is queued, clear before adding another to the queue.
744 if (this.clear_queued) {
744 if (this.clear_queued) {
745 this.clear_output(false);
745 this.clear_output(false);
746 };
746 };
747
747
748 this.clear_queued = true;
748 this.clear_queued = true;
749 } else {
749 } else {
750
750
751 // Fix the output div's height if the clear_output is waiting for
751 // Fix the output div's height if the clear_output is waiting for
752 // new output (it is being used in an animation).
752 // new output (it is being used in an animation).
753 if (this.clear_queued) {
753 if (this.clear_queued) {
754 var height = this.element.height();
754 var height = this.element.height();
755 this.element.height(height);
755 this.element.height(height);
756 this.clear_queued = false;
756 this.clear_queued = false;
757 }
757 }
758
758
759 // clear all, no need for logic
759 // clear all, no need for logic
760 this.element.html("");
760 this.element.html("");
761 this.outputs = [];
761 this.outputs = [];
762 this.trusted = true;
762 this.trusted = true;
763 this.unscroll_area();
763 this.unscroll_area();
764 return;
764 return;
765 };
765 };
766 };
766 };
767
767
768
768
769 // JSON serialization
769 // JSON serialization
770
770
771 OutputArea.prototype.fromJSON = function (outputs) {
771 OutputArea.prototype.fromJSON = function (outputs) {
772 var len = outputs.length;
772 var len = outputs.length;
773 var data;
773 var data;
774
774
775 for (var i=0; i<len; i++) {
775 for (var i=0; i<len; i++) {
776 data = outputs[i];
776 data = outputs[i];
777 var msg_type = data.output_type;
777 var msg_type = data.output_type;
778 if (msg_type === "display_data" || msg_type === "pyout") {
778 if (msg_type === "display_data" || msg_type === "pyout") {
779 // convert short keys to mime keys
779 // convert short keys to mime keys
780 // TODO: remove mapping of short keys when we update to nbformat 4
780 // TODO: remove mapping of short keys when we update to nbformat 4
781 data = this.rename_keys(data, OutputArea.mime_map_r);
781 data = this.rename_keys(data, OutputArea.mime_map_r);
782 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map_r);
782 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map_r);
783 }
783 }
784
784
785 this.append_output(data);
785 this.append_output(data);
786 }
786 }
787 };
787 };
788
788
789
789
790 OutputArea.prototype.toJSON = function () {
790 OutputArea.prototype.toJSON = function () {
791 var outputs = [];
791 var outputs = [];
792 var len = this.outputs.length;
792 var len = this.outputs.length;
793 var data;
793 var data;
794 for (var i=0; i<len; i++) {
794 for (var i=0; i<len; i++) {
795 data = this.outputs[i];
795 data = this.outputs[i];
796 var msg_type = data.output_type;
796 var msg_type = data.output_type;
797 if (msg_type === "display_data" || msg_type === "pyout") {
797 if (msg_type === "display_data" || msg_type === "pyout") {
798 // convert mime keys to short keys
798 // convert mime keys to short keys
799 data = this.rename_keys(data, OutputArea.mime_map);
799 data = this.rename_keys(data, OutputArea.mime_map);
800 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map);
800 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map);
801 }
801 }
802 outputs[i] = data;
802 outputs[i] = data;
803 }
803 }
804 return outputs;
804 return outputs;
805 };
805 };
806
806
807 /**
807 /**
808 * Class properties
808 * Class properties
809 **/
809 **/
810
810
811 /**
811 /**
812 * Threshold to trigger autoscroll when the OutputArea is resized,
812 * Threshold to trigger autoscroll when the OutputArea is resized,
813 * typically when new outputs are added.
813 * typically when new outputs are added.
814 *
814 *
815 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
815 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
816 * unless it is < 0, in which case autoscroll will never be triggered
816 * unless it is < 0, in which case autoscroll will never be triggered
817 *
817 *
818 * @property auto_scroll_threshold
818 * @property auto_scroll_threshold
819 * @type Number
819 * @type Number
820 * @default 100
820 * @default 100
821 *
821 *
822 **/
822 **/
823 OutputArea.auto_scroll_threshold = 100;
823 OutputArea.auto_scroll_threshold = 100;
824
824
825 /**
825 /**
826 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
826 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
827 * shorter than this are never scrolled.
827 * shorter than this are never scrolled.
828 *
828 *
829 * @property minimum_scroll_threshold
829 * @property minimum_scroll_threshold
830 * @type Number
830 * @type Number
831 * @default 20
831 * @default 20
832 *
832 *
833 **/
833 **/
834 OutputArea.minimum_scroll_threshold = 20;
834 OutputArea.minimum_scroll_threshold = 20;
835
835
836
836
837
837
838 OutputArea.mime_map = {
838 OutputArea.mime_map = {
839 "text/plain" : "text",
839 "text/plain" : "text",
840 "text/html" : "html",
840 "text/html" : "html",
841 "image/svg+xml" : "svg",
841 "image/svg+xml" : "svg",
842 "image/png" : "png",
842 "image/png" : "png",
843 "image/jpeg" : "jpeg",
843 "image/jpeg" : "jpeg",
844 "text/latex" : "latex",
844 "text/latex" : "latex",
845 "application/json" : "json",
845 "application/json" : "json",
846 "application/javascript" : "javascript",
846 "application/javascript" : "javascript",
847 };
847 };
848
848
849 OutputArea.mime_map_r = {
849 OutputArea.mime_map_r = {
850 "text" : "text/plain",
850 "text" : "text/plain",
851 "html" : "text/html",
851 "html" : "text/html",
852 "svg" : "image/svg+xml",
852 "svg" : "image/svg+xml",
853 "png" : "image/png",
853 "png" : "image/png",
854 "jpeg" : "image/jpeg",
854 "jpeg" : "image/jpeg",
855 "latex" : "text/latex",
855 "latex" : "text/latex",
856 "json" : "application/json",
856 "json" : "application/json",
857 "javascript" : "application/javascript",
857 "javascript" : "application/javascript",
858 };
858 };
859
859
860 OutputArea.display_order = [
860 OutputArea.display_order = [
861 'application/javascript',
861 'application/javascript',
862 'text/html',
862 'text/html',
863 'text/latex',
863 'text/latex',
864 'image/svg+xml',
864 'image/svg+xml',
865 'image/png',
865 'image/png',
866 'image/jpeg',
866 'image/jpeg',
867 'application/pdf',
867 'application/pdf',
868 'text/plain'
868 'text/plain'
869 ];
869 ];
870
870
871 OutputArea.append_map = {
871 OutputArea.append_map = {
872 "text/plain" : OutputArea.prototype.append_text,
872 "text/plain" : OutputArea.prototype.append_text,
873 "text/html" : OutputArea.prototype.append_html,
873 "text/html" : OutputArea.prototype.append_html,
874 "image/svg+xml" : OutputArea.prototype.append_svg,
874 "image/svg+xml" : OutputArea.prototype.append_svg,
875 "image/png" : OutputArea.prototype.append_png,
875 "image/png" : OutputArea.prototype.append_png,
876 "image/jpeg" : OutputArea.prototype.append_jpeg,
876 "image/jpeg" : OutputArea.prototype.append_jpeg,
877 "text/latex" : OutputArea.prototype.append_latex,
877 "text/latex" : OutputArea.prototype.append_latex,
878 "application/javascript" : OutputArea.prototype.append_javascript,
878 "application/javascript" : OutputArea.prototype.append_javascript,
879 "application/pdf" : OutputArea.prototype.append_pdf
879 "application/pdf" : OutputArea.prototype.append_pdf
880 };
880 };
881
881
882 IPython.OutputArea = OutputArea;
882 IPython.OutputArea = OutputArea;
883
883
884 return IPython;
884 return IPython;
885
885
886 }(IPython));
886 }(IPython));
General Comments 0
You need to be logged in to leave comments. Login now