##// END OF EJS Templates
HTML and JavaScript output KBM event handling.
Brian E. Granger -
Show More
@@ -1,730 +1,732
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.clear_queued = null;
34 this.clear_queued = null;
35 if (prompt_area === undefined) {
35 if (prompt_area === undefined) {
36 this.prompt_area = true;
36 this.prompt_area = true;
37 } else {
37 } else {
38 this.prompt_area = prompt_area;
38 this.prompt_area = prompt_area;
39 }
39 }
40 this.create_elements();
40 this.create_elements();
41 this.style();
41 this.style();
42 this.bind_events();
42 this.bind_events();
43 };
43 };
44
44
45 OutputArea.prototype.create_elements = function () {
45 OutputArea.prototype.create_elements = function () {
46 this.element = $("<div/>");
46 this.element = $("<div/>");
47 this.collapse_button = $("<div/>");
47 this.collapse_button = $("<div/>");
48 this.prompt_overlay = $("<div/>");
48 this.prompt_overlay = $("<div/>");
49 this.wrapper.append(this.prompt_overlay);
49 this.wrapper.append(this.prompt_overlay);
50 this.wrapper.append(this.element);
50 this.wrapper.append(this.element);
51 this.wrapper.append(this.collapse_button);
51 this.wrapper.append(this.collapse_button);
52 };
52 };
53
53
54
54
55 OutputArea.prototype.style = function () {
55 OutputArea.prototype.style = function () {
56 this.collapse_button.hide();
56 this.collapse_button.hide();
57 this.prompt_overlay.hide();
57 this.prompt_overlay.hide();
58
58
59 this.wrapper.addClass('output_wrapper');
59 this.wrapper.addClass('output_wrapper');
60 this.element.addClass('output');
60 this.element.addClass('output');
61
61
62 this.collapse_button.addClass("btn output_collapsed");
62 this.collapse_button.addClass("btn output_collapsed");
63 this.collapse_button.attr('title', 'click to expand output');
63 this.collapse_button.attr('title', 'click to expand output');
64 this.collapse_button.html('. . .');
64 this.collapse_button.html('. . .');
65
65
66 this.prompt_overlay.addClass('out_prompt_overlay prompt');
66 this.prompt_overlay.addClass('out_prompt_overlay prompt');
67 this.prompt_overlay.attr('title', 'click to expand output; double click to hide output');
67 this.prompt_overlay.attr('title', 'click to expand output; double click to hide output');
68
68
69 this.collapse();
69 this.collapse();
70 };
70 };
71
71
72 /**
72 /**
73 * Should the OutputArea scroll?
73 * Should the OutputArea scroll?
74 * Returns whether the height (in lines) exceeds a threshold.
74 * Returns whether the height (in lines) exceeds a threshold.
75 *
75 *
76 * @private
76 * @private
77 * @method _should_scroll
77 * @method _should_scroll
78 * @param [lines=100]{Integer}
78 * @param [lines=100]{Integer}
79 * @return {Bool}
79 * @return {Bool}
80 *
80 *
81 */
81 */
82 OutputArea.prototype._should_scroll = function (lines) {
82 OutputArea.prototype._should_scroll = function (lines) {
83 if (lines <=0 ){ return }
83 if (lines <=0 ){ return }
84 if (!lines) {
84 if (!lines) {
85 lines = 100;
85 lines = 100;
86 }
86 }
87 // line-height from http://stackoverflow.com/questions/1185151
87 // line-height from http://stackoverflow.com/questions/1185151
88 var fontSize = this.element.css('font-size');
88 var fontSize = this.element.css('font-size');
89 var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5);
89 var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5);
90
90
91 return (this.element.height() > lines * lineHeight);
91 return (this.element.height() > lines * lineHeight);
92 };
92 };
93
93
94
94
95 OutputArea.prototype.bind_events = function () {
95 OutputArea.prototype.bind_events = function () {
96 var that = this;
96 var that = this;
97 this.prompt_overlay.dblclick(function () { that.toggle_output(); });
97 this.prompt_overlay.dblclick(function () { that.toggle_output(); });
98 this.prompt_overlay.click(function () { that.toggle_scroll(); });
98 this.prompt_overlay.click(function () { that.toggle_scroll(); });
99
99
100 this.element.resize(function () {
100 this.element.resize(function () {
101 // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled
101 // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled
102 if ( IPython.utils.browser[0] === "Firefox" ) {
102 if ( IPython.utils.browser[0] === "Firefox" ) {
103 return;
103 return;
104 }
104 }
105 // maybe scroll output,
105 // maybe scroll output,
106 // if it's grown large enough and hasn't already been scrolled.
106 // if it's grown large enough and hasn't already been scrolled.
107 if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) {
107 if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) {
108 that.scroll_area();
108 that.scroll_area();
109 }
109 }
110 });
110 });
111 this.collapse_button.click(function () {
111 this.collapse_button.click(function () {
112 that.expand();
112 that.expand();
113 });
113 });
114 };
114 };
115
115
116
116
117 OutputArea.prototype.collapse = function () {
117 OutputArea.prototype.collapse = function () {
118 if (!this.collapsed) {
118 if (!this.collapsed) {
119 this.element.hide();
119 this.element.hide();
120 this.prompt_overlay.hide();
120 this.prompt_overlay.hide();
121 if (this.element.html()){
121 if (this.element.html()){
122 this.collapse_button.show();
122 this.collapse_button.show();
123 }
123 }
124 this.collapsed = true;
124 this.collapsed = true;
125 }
125 }
126 };
126 };
127
127
128
128
129 OutputArea.prototype.expand = function () {
129 OutputArea.prototype.expand = function () {
130 if (this.collapsed) {
130 if (this.collapsed) {
131 this.collapse_button.hide();
131 this.collapse_button.hide();
132 this.element.show();
132 this.element.show();
133 this.prompt_overlay.show();
133 this.prompt_overlay.show();
134 this.collapsed = false;
134 this.collapsed = false;
135 }
135 }
136 };
136 };
137
137
138
138
139 OutputArea.prototype.toggle_output = function () {
139 OutputArea.prototype.toggle_output = function () {
140 if (this.collapsed) {
140 if (this.collapsed) {
141 this.expand();
141 this.expand();
142 } else {
142 } else {
143 this.collapse();
143 this.collapse();
144 }
144 }
145 };
145 };
146
146
147
147
148 OutputArea.prototype.scroll_area = function () {
148 OutputArea.prototype.scroll_area = function () {
149 this.element.addClass('output_scroll');
149 this.element.addClass('output_scroll');
150 this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide');
150 this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide');
151 this.scrolled = true;
151 this.scrolled = true;
152 };
152 };
153
153
154
154
155 OutputArea.prototype.unscroll_area = function () {
155 OutputArea.prototype.unscroll_area = function () {
156 this.element.removeClass('output_scroll');
156 this.element.removeClass('output_scroll');
157 this.prompt_overlay.attr('title', 'click to scroll output; double click to hide');
157 this.prompt_overlay.attr('title', 'click to scroll output; double click to hide');
158 this.scrolled = false;
158 this.scrolled = false;
159 };
159 };
160
160
161 /**
161 /**
162 * Threshold to trigger autoscroll when the OutputArea is resized,
162 * Threshold to trigger autoscroll when the OutputArea is resized,
163 * typically when new outputs are added.
163 * typically when new outputs are added.
164 *
164 *
165 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
165 * Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
166 * unless it is < 0, in which case autoscroll will never be triggered
166 * unless it is < 0, in which case autoscroll will never be triggered
167 *
167 *
168 * @property auto_scroll_threshold
168 * @property auto_scroll_threshold
169 * @type Number
169 * @type Number
170 * @default 100
170 * @default 100
171 *
171 *
172 **/
172 **/
173 OutputArea.auto_scroll_threshold = 100;
173 OutputArea.auto_scroll_threshold = 100;
174
174
175
175
176 /**
176 /**
177 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
177 * Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
178 * shorter than this are never scrolled.
178 * shorter than this are never scrolled.
179 *
179 *
180 * @property minimum_scroll_threshold
180 * @property minimum_scroll_threshold
181 * @type Number
181 * @type Number
182 * @default 20
182 * @default 20
183 *
183 *
184 **/
184 **/
185 OutputArea.minimum_scroll_threshold = 20;
185 OutputArea.minimum_scroll_threshold = 20;
186
186
187
187
188 /**
188 /**
189 *
189 *
190 * Scroll OutputArea if height supperior than a threshold (in lines).
190 * Scroll OutputArea if height supperior than a threshold (in lines).
191 *
191 *
192 * Threshold is a maximum number of lines. If unspecified, defaults to
192 * Threshold is a maximum number of lines. If unspecified, defaults to
193 * OutputArea.minimum_scroll_threshold.
193 * OutputArea.minimum_scroll_threshold.
194 *
194 *
195 * Negative threshold will prevent the OutputArea from ever scrolling.
195 * Negative threshold will prevent the OutputArea from ever scrolling.
196 *
196 *
197 * @method scroll_if_long
197 * @method scroll_if_long
198 *
198 *
199 * @param [lines=20]{Number} Default to 20 if not set,
199 * @param [lines=20]{Number} Default to 20 if not set,
200 * behavior undefined for value of `0`.
200 * behavior undefined for value of `0`.
201 *
201 *
202 **/
202 **/
203 OutputArea.prototype.scroll_if_long = function (lines) {
203 OutputArea.prototype.scroll_if_long = function (lines) {
204 var n = lines | OutputArea.minimum_scroll_threshold;
204 var n = lines | OutputArea.minimum_scroll_threshold;
205 if(n <= 0){
205 if(n <= 0){
206 return
206 return
207 }
207 }
208
208
209 if (this._should_scroll(n)) {
209 if (this._should_scroll(n)) {
210 // only allow scrolling long-enough output
210 // only allow scrolling long-enough output
211 this.scroll_area();
211 this.scroll_area();
212 }
212 }
213 };
213 };
214
214
215
215
216 OutputArea.prototype.toggle_scroll = function () {
216 OutputArea.prototype.toggle_scroll = function () {
217 if (this.scrolled) {
217 if (this.scrolled) {
218 this.unscroll_area();
218 this.unscroll_area();
219 } else {
219 } else {
220 // only allow scrolling long-enough output
220 // only allow scrolling long-enough output
221 this.scroll_if_long();
221 this.scroll_if_long();
222 }
222 }
223 };
223 };
224
224
225
225
226 // typeset with MathJax if MathJax is available
226 // typeset with MathJax if MathJax is available
227 OutputArea.prototype.typeset = function () {
227 OutputArea.prototype.typeset = function () {
228 if (window.MathJax){
228 if (window.MathJax){
229 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
229 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
230 }
230 }
231 };
231 };
232
232
233
233
234 OutputArea.prototype.handle_output = function (msg) {
234 OutputArea.prototype.handle_output = function (msg) {
235 var json = {};
235 var json = {};
236 var msg_type = json.output_type = msg.header.msg_type;
236 var msg_type = json.output_type = msg.header.msg_type;
237 var content = msg.content;
237 var content = msg.content;
238 if (msg_type === "stream") {
238 if (msg_type === "stream") {
239 json.text = content.data;
239 json.text = content.data;
240 json.stream = content.name;
240 json.stream = content.name;
241 } else if (msg_type === "display_data") {
241 } else if (msg_type === "display_data") {
242 json = this.convert_mime_types(json, content.data);
242 json = this.convert_mime_types(json, content.data);
243 json.metadata = this.convert_mime_types({}, content.metadata);
243 json.metadata = this.convert_mime_types({}, content.metadata);
244 } else if (msg_type === "pyout") {
244 } else if (msg_type === "pyout") {
245 json.prompt_number = content.execution_count;
245 json.prompt_number = content.execution_count;
246 json = this.convert_mime_types(json, content.data);
246 json = this.convert_mime_types(json, content.data);
247 json.metadata = this.convert_mime_types({}, content.metadata);
247 json.metadata = this.convert_mime_types({}, content.metadata);
248 } else if (msg_type === "pyerr") {
248 } else if (msg_type === "pyerr") {
249 json.ename = content.ename;
249 json.ename = content.ename;
250 json.evalue = content.evalue;
250 json.evalue = content.evalue;
251 json.traceback = content.traceback;
251 json.traceback = content.traceback;
252 }
252 }
253 // append with dynamic=true
253 // append with dynamic=true
254 this.append_output(json, true);
254 this.append_output(json, true);
255 };
255 };
256
256
257
257
258 OutputArea.prototype.convert_mime_types = function (json, data) {
258 OutputArea.prototype.convert_mime_types = function (json, data) {
259 if (data === undefined) {
259 if (data === undefined) {
260 return json;
260 return json;
261 }
261 }
262 if (data['text/plain'] !== undefined) {
262 if (data['text/plain'] !== undefined) {
263 json.text = data['text/plain'];
263 json.text = data['text/plain'];
264 }
264 }
265 if (data['text/html'] !== undefined) {
265 if (data['text/html'] !== undefined) {
266 json.html = data['text/html'];
266 json.html = data['text/html'];
267 }
267 }
268 if (data['image/svg+xml'] !== undefined) {
268 if (data['image/svg+xml'] !== undefined) {
269 json.svg = data['image/svg+xml'];
269 json.svg = data['image/svg+xml'];
270 }
270 }
271 if (data['image/png'] !== undefined) {
271 if (data['image/png'] !== undefined) {
272 json.png = data['image/png'];
272 json.png = data['image/png'];
273 }
273 }
274 if (data['image/jpeg'] !== undefined) {
274 if (data['image/jpeg'] !== undefined) {
275 json.jpeg = data['image/jpeg'];
275 json.jpeg = data['image/jpeg'];
276 }
276 }
277 if (data['text/latex'] !== undefined) {
277 if (data['text/latex'] !== undefined) {
278 json.latex = data['text/latex'];
278 json.latex = data['text/latex'];
279 }
279 }
280 if (data['application/json'] !== undefined) {
280 if (data['application/json'] !== undefined) {
281 json.json = data['application/json'];
281 json.json = data['application/json'];
282 }
282 }
283 if (data['application/javascript'] !== undefined) {
283 if (data['application/javascript'] !== undefined) {
284 json.javascript = data['application/javascript'];
284 json.javascript = data['application/javascript'];
285 }
285 }
286 return json;
286 return json;
287 };
287 };
288
288
289
289
290 OutputArea.prototype.append_output = function (json, dynamic) {
290 OutputArea.prototype.append_output = function (json, dynamic) {
291 // If dynamic is true, javascript output will be eval'd.
291 // If dynamic is true, javascript output will be eval'd.
292 this.expand();
292 this.expand();
293 // Clear the output if clear is queued.
293 // Clear the output if clear is queued.
294 var needs_height_reset = false;
294 var needs_height_reset = false;
295 if (this.clear_queued) {
295 if (this.clear_queued) {
296 this.clear_output(false);
296 this.clear_output(false);
297 needs_height_reset = true;
297 needs_height_reset = true;
298 }
298 }
299
299
300 if (json.output_type === 'pyout') {
300 if (json.output_type === 'pyout') {
301 this.append_pyout(json, dynamic);
301 this.append_pyout(json, dynamic);
302 } else if (json.output_type === 'pyerr') {
302 } else if (json.output_type === 'pyerr') {
303 this.append_pyerr(json);
303 this.append_pyerr(json);
304 } else if (json.output_type === 'display_data') {
304 } else if (json.output_type === 'display_data') {
305 this.append_display_data(json, dynamic);
305 this.append_display_data(json, dynamic);
306 } else if (json.output_type === 'stream') {
306 } else if (json.output_type === 'stream') {
307 this.append_stream(json);
307 this.append_stream(json);
308 }
308 }
309 this.outputs.push(json);
309 this.outputs.push(json);
310
310
311 // Only reset the height to automatic if the height is currently
311 // Only reset the height to automatic if the height is currently
312 // fixed (done by wait=True flag on clear_output).
312 // fixed (done by wait=True flag on clear_output).
313 if (needs_height_reset) {
313 if (needs_height_reset) {
314 this.element.height('');
314 this.element.height('');
315 }
315 }
316
316
317 var that = this;
317 var that = this;
318 setTimeout(function(){that.element.trigger('resize');}, 100);
318 setTimeout(function(){that.element.trigger('resize');}, 100);
319 };
319 };
320
320
321
321
322 OutputArea.prototype.create_output_area = function () {
322 OutputArea.prototype.create_output_area = function () {
323 var oa = $("<div/>").addClass("output_area");
323 var oa = $("<div/>").addClass("output_area");
324 if (this.prompt_area) {
324 if (this.prompt_area) {
325 oa.append($('<div/>').addClass('prompt'));
325 oa.append($('<div/>').addClass('prompt'));
326 }
326 }
327 return oa;
327 return oa;
328 };
328 };
329
329
330
330
331 OutputArea.prototype.create_output_subarea = function(md, classes) {
331 OutputArea.prototype.create_output_subarea = function(md, classes) {
332 var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
332 var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
333 if (md['isolated']) {
333 if (md['isolated']) {
334 // Create an iframe to isolate the subarea from the rest of the
334 // Create an iframe to isolate the subarea from the rest of the
335 // document
335 // document
336 var iframe = $('<iframe/>').addClass('box-flex1');
336 var iframe = $('<iframe/>').addClass('box-flex1');
337 iframe.css({'height':1, 'width':'100%', 'display':'block'});
337 iframe.css({'height':1, 'width':'100%', 'display':'block'});
338 iframe.attr('frameborder', 0);
338 iframe.attr('frameborder', 0);
339 iframe.attr('scrolling', 'auto');
339 iframe.attr('scrolling', 'auto');
340
340
341 // Once the iframe is loaded, the subarea is dynamically inserted
341 // Once the iframe is loaded, the subarea is dynamically inserted
342 iframe.on('load', function() {
342 iframe.on('load', function() {
343 // Workaround needed by Firefox, to properly render svg inside
343 // Workaround needed by Firefox, to properly render svg inside
344 // iframes, see http://stackoverflow.com/questions/10177190/
344 // iframes, see http://stackoverflow.com/questions/10177190/
345 // svg-dynamically-added-to-iframe-does-not-render-correctly
345 // svg-dynamically-added-to-iframe-does-not-render-correctly
346 this.contentDocument.open();
346 this.contentDocument.open();
347
347
348 // Insert the subarea into the iframe
348 // Insert the subarea into the iframe
349 // We must directly write the html. When using Jquery's append
349 // We must directly write the html. When using Jquery's append
350 // method, javascript is evaluated in the parent document and
350 // method, javascript is evaluated in the parent document and
351 // not in the iframe document.
351 // not in the iframe document.
352 this.contentDocument.write(subarea.html());
352 this.contentDocument.write(subarea.html());
353
353
354 this.contentDocument.close();
354 this.contentDocument.close();
355
355
356 var body = this.contentDocument.body;
356 var body = this.contentDocument.body;
357 // Adjust the iframe height automatically
357 // Adjust the iframe height automatically
358 iframe.height(body.scrollHeight + 'px');
358 iframe.height(body.scrollHeight + 'px');
359 });
359 });
360
360
361 // Elements should be appended to the inner subarea and not to the
361 // Elements should be appended to the inner subarea and not to the
362 // iframe
362 // iframe
363 iframe.append = function(that) {
363 iframe.append = function(that) {
364 subarea.append(that);
364 subarea.append(that);
365 };
365 };
366
366
367 return iframe;
367 return iframe;
368 } else {
368 } else {
369 return subarea;
369 return subarea;
370 }
370 }
371 }
371 }
372
372
373
373
374 OutputArea.prototype._append_javascript_error = function (err, element) {
374 OutputArea.prototype._append_javascript_error = function (err, element) {
375 // display a message when a javascript error occurs in display output
375 // display a message when a javascript error occurs in display output
376 var msg = "Javascript error adding output!"
376 var msg = "Javascript error adding output!"
377 if ( element === undefined ) return;
377 if ( element === undefined ) return;
378 element.append(
378 element.append(
379 $('<div/>').html(msg + "<br/>" +
379 $('<div/>').html(msg + "<br/>" +
380 err.toString() +
380 err.toString() +
381 '<br/>See your browser Javascript console for more details.'
381 '<br/>See your browser Javascript console for more details.'
382 ).addClass('js-error')
382 ).addClass('js-error')
383 );
383 );
384 };
384 };
385
385
386 OutputArea.prototype._safe_append = function (toinsert) {
386 OutputArea.prototype._safe_append = function (toinsert) {
387 // safely append an item to the document
387 // safely append an item to the document
388 // this is an object created by user code,
388 // this is an object created by user code,
389 // and may have errors, which should not be raised
389 // and may have errors, which should not be raised
390 // under any circumstances.
390 // under any circumstances.
391 try {
391 try {
392 this.element.append(toinsert);
392 this.element.append(toinsert);
393 } catch(err) {
393 } catch(err) {
394 console.log(err);
394 console.log(err);
395 // Create an actual output_area and output_subarea, which creates
395 // Create an actual output_area and output_subarea, which creates
396 // the prompt area and the proper indentation.
396 // the prompt area and the proper indentation.
397 var toinsert = this.create_output_area();
397 var toinsert = this.create_output_area();
398 var subarea = $('<div/>').addClass('output_subarea');
398 var subarea = $('<div/>').addClass('output_subarea');
399 toinsert.append(subarea);
399 toinsert.append(subarea);
400 this._append_javascript_error(err, subarea);
400 this._append_javascript_error(err, subarea);
401 this.element.append(toinsert);
401 this.element.append(toinsert);
402 }
402 }
403 };
403 };
404
404
405
405
406 OutputArea.prototype.append_pyout = function (json, dynamic) {
406 OutputArea.prototype.append_pyout = function (json, dynamic) {
407 var n = json.prompt_number || ' ';
407 var n = json.prompt_number || ' ';
408 var toinsert = this.create_output_area();
408 var toinsert = this.create_output_area();
409 if (this.prompt_area) {
409 if (this.prompt_area) {
410 toinsert.find('div.prompt').addClass('output_prompt').html('Out[' + n + ']:');
410 toinsert.find('div.prompt').addClass('output_prompt').html('Out[' + n + ']:');
411 }
411 }
412 this.append_mime_type(json, toinsert, dynamic);
412 this.append_mime_type(json, toinsert, dynamic);
413 this._safe_append(toinsert);
413 this._safe_append(toinsert);
414 // If we just output latex, typeset it.
414 // If we just output latex, typeset it.
415 if ((json.latex !== undefined) || (json.html !== undefined)) {
415 if ((json.latex !== undefined) || (json.html !== undefined)) {
416 this.typeset();
416 this.typeset();
417 }
417 }
418 };
418 };
419
419
420
420
421 OutputArea.prototype.append_pyerr = function (json) {
421 OutputArea.prototype.append_pyerr = function (json) {
422 var tb = json.traceback;
422 var tb = json.traceback;
423 if (tb !== undefined && tb.length > 0) {
423 if (tb !== undefined && tb.length > 0) {
424 var s = '';
424 var s = '';
425 var len = tb.length;
425 var len = tb.length;
426 for (var i=0; i<len; i++) {
426 for (var i=0; i<len; i++) {
427 s = s + tb[i] + '\n';
427 s = s + tb[i] + '\n';
428 }
428 }
429 s = s + '\n';
429 s = s + '\n';
430 var toinsert = this.create_output_area();
430 var toinsert = this.create_output_area();
431 this.append_text(s, {}, toinsert);
431 this.append_text(s, {}, toinsert);
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 pre.html(html);
455 pre.html(html);
456 return;
456 return;
457 }
457 }
458 }
458 }
459
459
460 if (!text.replace("\r", "")) {
460 if (!text.replace("\r", "")) {
461 // text is nothing (empty string, \r, etc.)
461 // text is nothing (empty string, \r, etc.)
462 // so don't append any elements, which might add undesirable space
462 // so don't append any elements, which might add undesirable space
463 return;
463 return;
464 }
464 }
465
465
466 // If we got here, attach a new div
466 // If we got here, attach a new div
467 var toinsert = this.create_output_area();
467 var toinsert = this.create_output_area();
468 this.append_text(text, {}, toinsert, "output_stream "+subclass);
468 this.append_text(text, {}, toinsert, "output_stream "+subclass);
469 this._safe_append(toinsert);
469 this._safe_append(toinsert);
470 };
470 };
471
471
472
472
473 OutputArea.prototype.append_display_data = function (json, dynamic) {
473 OutputArea.prototype.append_display_data = function (json, dynamic) {
474 var toinsert = this.create_output_area();
474 var toinsert = this.create_output_area();
475 if (this.append_mime_type(json, toinsert, dynamic)) {
475 if (this.append_mime_type(json, toinsert, dynamic)) {
476 this._safe_append(toinsert);
476 this._safe_append(toinsert);
477 // If we just output latex, typeset it.
477 // If we just output latex, typeset it.
478 if ( (json.latex !== undefined) || (json.html !== undefined) ) {
478 if ( (json.latex !== undefined) || (json.html !== undefined) ) {
479 this.typeset();
479 this.typeset();
480 }
480 }
481 }
481 }
482 };
482 };
483
483
484 OutputArea.display_order = ['javascript','html','latex','svg','png','jpeg','text'];
484 OutputArea.display_order = ['javascript','html','latex','svg','png','jpeg','text'];
485
485
486 OutputArea.prototype.append_mime_type = function (json, element, dynamic) {
486 OutputArea.prototype.append_mime_type = function (json, element, dynamic) {
487 for(var type_i in OutputArea.display_order){
487 for(var type_i in OutputArea.display_order){
488 var type = OutputArea.display_order[type_i];
488 var type = OutputArea.display_order[type_i];
489 if(json[type] != undefined ){
489 if(json[type] != undefined ){
490 var md = {};
490 var md = {};
491 if (json.metadata && json.metadata[type]) {
491 if (json.metadata && json.metadata[type]) {
492 md = json.metadata[type];
492 md = json.metadata[type];
493 };
493 };
494 if(type == 'javascript'){
494 if(type == 'javascript'){
495 if (dynamic) {
495 if (dynamic) {
496 this.append_javascript(json.javascript, md, element, dynamic);
496 this.append_javascript(json.javascript, md, element, dynamic);
497 return true;
497 return true;
498 }
498 }
499 } else {
499 } else {
500 this['append_'+type](json[type], md, element);
500 this['append_'+type](json[type], md, element);
501 return true;
501 return true;
502 }
502 }
503 return false;
503 return false;
504 }
504 }
505 }
505 }
506 return false;
506 return false;
507 };
507 };
508
508
509
509
510 OutputArea.prototype.append_html = function (html, md, element) {
510 OutputArea.prototype.append_html = function (html, md, element) {
511 var toinsert = this.create_output_subarea(md, "output_html rendered_html");
511 var toinsert = this.create_output_subarea(md, "output_html rendered_html");
512 IPython.keyboard_manager.register_events(toinsert);
512 toinsert.append(html);
513 toinsert.append(html);
513 element.append(toinsert);
514 element.append(toinsert);
514 };
515 };
515
516
516
517
517 OutputArea.prototype.append_javascript = function (js, md, container) {
518 OutputArea.prototype.append_javascript = function (js, md, container) {
518 // We just eval the JS code, element appears in the local scope.
519 // We just eval the JS code, element appears in the local scope.
519 var element = this.create_output_subarea(md, "output_javascript");
520 var element = this.create_output_subarea(md, "output_javascript");
521 IPython.keyboard_manager.register_events(element);
520 container.append(element);
522 container.append(element);
521 try {
523 try {
522 eval(js);
524 eval(js);
523 } catch(err) {
525 } catch(err) {
524 console.log(err);
526 console.log(err);
525 this._append_javascript_error(err, element);
527 this._append_javascript_error(err, element);
526 }
528 }
527 };
529 };
528
530
529
531
530 OutputArea.prototype.append_text = function (data, md, element, extra_class) {
532 OutputArea.prototype.append_text = function (data, md, element, extra_class) {
531 var toinsert = this.create_output_subarea(md, "output_text");
533 var toinsert = this.create_output_subarea(md, "output_text");
532 // escape ANSI & HTML specials in plaintext:
534 // escape ANSI & HTML specials in plaintext:
533 data = utils.fixConsole(data);
535 data = utils.fixConsole(data);
534 data = utils.fixCarriageReturn(data);
536 data = utils.fixCarriageReturn(data);
535 data = utils.autoLinkUrls(data);
537 data = utils.autoLinkUrls(data);
536 if (extra_class){
538 if (extra_class){
537 toinsert.addClass(extra_class);
539 toinsert.addClass(extra_class);
538 }
540 }
539 toinsert.append($("<pre/>").html(data));
541 toinsert.append($("<pre/>").html(data));
540 element.append(toinsert);
542 element.append(toinsert);
541 };
543 };
542
544
543
545
544 OutputArea.prototype.append_svg = function (svg, md, element) {
546 OutputArea.prototype.append_svg = function (svg, md, element) {
545 var toinsert = this.create_output_subarea(md, "output_svg");
547 var toinsert = this.create_output_subarea(md, "output_svg");
546 toinsert.append(svg);
548 toinsert.append(svg);
547 element.append(toinsert);
549 element.append(toinsert);
548 };
550 };
549
551
550
552
551 OutputArea.prototype._dblclick_to_reset_size = function (img) {
553 OutputArea.prototype._dblclick_to_reset_size = function (img) {
552 // schedule wrapping image in resizable after a delay,
554 // schedule wrapping image in resizable after a delay,
553 // so we don't end up calling resize on a zero-size object
555 // so we don't end up calling resize on a zero-size object
554 var that = this;
556 var that = this;
555 setTimeout(function () {
557 setTimeout(function () {
556 var h0 = img.height();
558 var h0 = img.height();
557 var w0 = img.width();
559 var w0 = img.width();
558 if (!(h0 && w0)) {
560 if (!(h0 && w0)) {
559 // zero size, schedule another timeout
561 // zero size, schedule another timeout
560 that._dblclick_to_reset_size(img);
562 that._dblclick_to_reset_size(img);
561 return;
563 return;
562 }
564 }
563 img.resizable({
565 img.resizable({
564 aspectRatio: true,
566 aspectRatio: true,
565 autoHide: true
567 autoHide: true
566 });
568 });
567 img.dblclick(function () {
569 img.dblclick(function () {
568 // resize wrapper & image together for some reason:
570 // resize wrapper & image together for some reason:
569 img.parent().height(h0);
571 img.parent().height(h0);
570 img.height(h0);
572 img.height(h0);
571 img.parent().width(w0);
573 img.parent().width(w0);
572 img.width(w0);
574 img.width(w0);
573 });
575 });
574 }, 250);
576 }, 250);
575 };
577 };
576
578
577
579
578 OutputArea.prototype.append_png = function (png, md, element) {
580 OutputArea.prototype.append_png = function (png, md, element) {
579 var toinsert = this.create_output_subarea(md, "output_png");
581 var toinsert = this.create_output_subarea(md, "output_png");
580 var img = $("<img/>");
582 var img = $("<img/>");
581 img[0].setAttribute('src','data:image/png;base64,'+png);
583 img[0].setAttribute('src','data:image/png;base64,'+png);
582 if (md['height']) {
584 if (md['height']) {
583 img[0].setAttribute('height', md['height']);
585 img[0].setAttribute('height', md['height']);
584 }
586 }
585 if (md['width']) {
587 if (md['width']) {
586 img[0].setAttribute('width', md['width']);
588 img[0].setAttribute('width', md['width']);
587 }
589 }
588 this._dblclick_to_reset_size(img);
590 this._dblclick_to_reset_size(img);
589 toinsert.append(img);
591 toinsert.append(img);
590 element.append(toinsert);
592 element.append(toinsert);
591 };
593 };
592
594
593
595
594 OutputArea.prototype.append_jpeg = function (jpeg, md, element) {
596 OutputArea.prototype.append_jpeg = function (jpeg, md, element) {
595 var toinsert = this.create_output_subarea(md, "output_jpeg");
597 var toinsert = this.create_output_subarea(md, "output_jpeg");
596 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
598 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
597 if (md['height']) {
599 if (md['height']) {
598 img.attr('height', md['height']);
600 img.attr('height', md['height']);
599 }
601 }
600 if (md['width']) {
602 if (md['width']) {
601 img.attr('width', md['width']);
603 img.attr('width', md['width']);
602 }
604 }
603 this._dblclick_to_reset_size(img);
605 this._dblclick_to_reset_size(img);
604 toinsert.append(img);
606 toinsert.append(img);
605 element.append(toinsert);
607 element.append(toinsert);
606 };
608 };
607
609
608
610
609 OutputArea.prototype.append_latex = function (latex, md, element) {
611 OutputArea.prototype.append_latex = function (latex, md, element) {
610 // This method cannot do the typesetting because the latex first has to
612 // This method cannot do the typesetting because the latex first has to
611 // be on the page.
613 // be on the page.
612 var toinsert = this.create_output_subarea(md, "output_latex");
614 var toinsert = this.create_output_subarea(md, "output_latex");
613 toinsert.append(latex);
615 toinsert.append(latex);
614 element.append(toinsert);
616 element.append(toinsert);
615 };
617 };
616
618
617 OutputArea.prototype.append_raw_input = function (msg) {
619 OutputArea.prototype.append_raw_input = function (msg) {
618 var that = this;
620 var that = this;
619 this.expand();
621 this.expand();
620 var content = msg.content;
622 var content = msg.content;
621 var area = this.create_output_area();
623 var area = this.create_output_area();
622
624
623 // disable any other raw_inputs, if they are left around
625 // disable any other raw_inputs, if they are left around
624 $("div.output_subarea.raw_input").remove();
626 $("div.output_subarea.raw_input").remove();
625
627
626 area.append(
628 area.append(
627 $("<div/>")
629 $("<div/>")
628 .addClass("box-flex1 output_subarea raw_input")
630 .addClass("box-flex1 output_subarea raw_input")
629 .append(
631 .append(
630 $("<span/>")
632 $("<span/>")
631 .addClass("input_prompt")
633 .addClass("input_prompt")
632 .text(content.prompt)
634 .text(content.prompt)
633 )
635 )
634 .append(
636 .append(
635 $("<input/>")
637 $("<input/>")
636 .addClass("raw_input")
638 .addClass("raw_input")
637 .attr('type', 'text')
639 .attr('type', 'text')
638 .attr("size", 47)
640 .attr("size", 47)
639 .keydown(function (event, ui) {
641 .keydown(function (event, ui) {
640 // make sure we submit on enter,
642 // make sure we submit on enter,
641 // and don't re-execute the *cell* on shift-enter
643 // and don't re-execute the *cell* on shift-enter
642 if (event.which === utils.keycodes.ENTER) {
644 if (event.which === utils.keycodes.ENTER) {
643 that._submit_raw_input();
645 that._submit_raw_input();
644 return false;
646 return false;
645 }
647 }
646 })
648 })
647 )
649 )
648 );
650 );
649 this.element.append(area);
651 this.element.append(area);
650 // weirdly need double-focus now,
652 // weirdly need double-focus now,
651 // otherwise only the cell will be focused
653 // otherwise only the cell will be focused
652 area.find("input.raw_input").focus().focus();
654 area.find("input.raw_input").focus().focus();
653 }
655 }
654 OutputArea.prototype._submit_raw_input = function (evt) {
656 OutputArea.prototype._submit_raw_input = function (evt) {
655 var container = this.element.find("div.raw_input");
657 var container = this.element.find("div.raw_input");
656 var theprompt = container.find("span.input_prompt");
658 var theprompt = container.find("span.input_prompt");
657 var theinput = container.find("input.raw_input");
659 var theinput = container.find("input.raw_input");
658 var value = theinput.val();
660 var value = theinput.val();
659 var content = {
661 var content = {
660 output_type : 'stream',
662 output_type : 'stream',
661 name : 'stdout',
663 name : 'stdout',
662 text : theprompt.text() + value + '\n'
664 text : theprompt.text() + value + '\n'
663 }
665 }
664 // remove form container
666 // remove form container
665 container.parent().remove();
667 container.parent().remove();
666 // replace with plaintext version in stdout
668 // replace with plaintext version in stdout
667 this.append_output(content, false);
669 this.append_output(content, false);
668 $([IPython.events]).trigger('send_input_reply.Kernel', value);
670 $([IPython.events]).trigger('send_input_reply.Kernel', value);
669 }
671 }
670
672
671
673
672 OutputArea.prototype.handle_clear_output = function (msg) {
674 OutputArea.prototype.handle_clear_output = function (msg) {
673 this.clear_output(msg.content.wait);
675 this.clear_output(msg.content.wait);
674 };
676 };
675
677
676
678
677 OutputArea.prototype.clear_output = function(wait) {
679 OutputArea.prototype.clear_output = function(wait) {
678 if (wait) {
680 if (wait) {
679
681
680 // If a clear is queued, clear before adding another to the queue.
682 // If a clear is queued, clear before adding another to the queue.
681 if (this.clear_queued) {
683 if (this.clear_queued) {
682 this.clear_output(false);
684 this.clear_output(false);
683 };
685 };
684
686
685 this.clear_queued = true;
687 this.clear_queued = true;
686 } else {
688 } else {
687
689
688 // Fix the output div's height if the clear_output is waiting for
690 // Fix the output div's height if the clear_output is waiting for
689 // new output (it is being used in an animation).
691 // new output (it is being used in an animation).
690 if (this.clear_queued) {
692 if (this.clear_queued) {
691 var height = this.element.height();
693 var height = this.element.height();
692 this.element.height(height);
694 this.element.height(height);
693 this.clear_queued = false;
695 this.clear_queued = false;
694 }
696 }
695
697
696 // clear all, no need for logic
698 // clear all, no need for logic
697 this.element.html("");
699 this.element.html("");
698 this.outputs = [];
700 this.outputs = [];
699 this.unscroll_area();
701 this.unscroll_area();
700 return;
702 return;
701 };
703 };
702 };
704 };
703
705
704
706
705 // JSON serialization
707 // JSON serialization
706
708
707 OutputArea.prototype.fromJSON = function (outputs) {
709 OutputArea.prototype.fromJSON = function (outputs) {
708 var len = outputs.length;
710 var len = outputs.length;
709 for (var i=0; i<len; i++) {
711 for (var i=0; i<len; i++) {
710 // append with dynamic=false.
712 // append with dynamic=false.
711 this.append_output(outputs[i], false);
713 this.append_output(outputs[i], false);
712 }
714 }
713 };
715 };
714
716
715
717
716 OutputArea.prototype.toJSON = function () {
718 OutputArea.prototype.toJSON = function () {
717 var outputs = [];
719 var outputs = [];
718 var len = this.outputs.length;
720 var len = this.outputs.length;
719 for (var i=0; i<len; i++) {
721 for (var i=0; i<len; i++) {
720 outputs[i] = this.outputs[i];
722 outputs[i] = this.outputs[i];
721 }
723 }
722 return outputs;
724 return outputs;
723 };
725 };
724
726
725
727
726 IPython.OutputArea = OutputArea;
728 IPython.OutputArea = OutputArea;
727
729
728 return IPython;
730 return IPython;
729
731
730 }(IPython));
732 }(IPython));
General Comments 0
You need to be logged in to leave comments. Login now