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