##// END OF EJS Templates
small fixes for #5320
small fixes for #5320

File last commit:

r15661:9957eeb7
r15970:2316ecfe
Show More
outputarea.js
868 lines | 28.8 KiB | application/javascript | JavascriptLexer
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 //----------------------------------------------------------------------------
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 // Copyright (C) 2008 The IPython Development Team
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 //
// Distributed under the terms of the BSD License. The full license is in
// the file COPYING, distributed as part of this software.
//----------------------------------------------------------------------------
//============================================================================
// OutputArea
//============================================================================
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 /**
* @module IPython
* @namespace IPython
* @submodule OutputArea
*/
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var IPython = (function (IPython) {
"use strict";
var utils = IPython.utils;
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 /**
* @class OutputArea
*
* @constructor
*/
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var OutputArea = function (selector, prompt_area) {
this.selector = selector;
MinRK
third attempt at scrolled long output...
r7362 this.wrapper = $(selector);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.outputs = [];
this.collapsed = false;
MinRK
third attempt at scrolled long output...
r7362 this.scrolled = false;
MinRK
sign notebooks
r14856 this.trusted = true;
Jonathan Frederic
Added wait flag to clear_output.
r12592 this.clear_queued = null;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 if (prompt_area === undefined) {
this.prompt_area = true;
Brian Granger
Fixing bug in prompt_area handling of OutputArea.
r7181 } else {
this.prompt_area = prompt_area;
Matthias BUSSONNIER
jslint
r9555 }
MinRK
third attempt at scrolled long output...
r7362 this.create_elements();
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.style();
MinRK
third attempt at scrolled long output...
r7362 this.bind_events();
};
Matthias BUSSONNIER
reorder class properties
r14886
/**
* Class prototypes
**/
MinRK
third attempt at scrolled long output...
r7362 OutputArea.prototype.create_elements = function () {
this.element = $("<div/>");
this.collapse_button = $("<div/>");
this.prompt_overlay = $("<div/>");
this.wrapper.append(this.prompt_overlay);
this.wrapper.append(this.element);
this.wrapper.append(this.collapse_button);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.style = function () {
MinRK
third attempt at scrolled long output...
r7362 this.collapse_button.hide();
this.prompt_overlay.hide();
this.wrapper.addClass('output_wrapper');
Matthias BUSSONNIER
remove more hard coded layout
r13332 this.element.addClass('output');
MinRK
third attempt at scrolled long output...
r7362
MinRK
bootstrap button output area
r10897 this.collapse_button.addClass("btn output_collapsed");
Harry Moreno
changed instances of 'outout' to 'output' in alt text's
r9903 this.collapse_button.attr('title', 'click to expand output');
Matthias BUSSONNIER
some $.html( -> $.text(...
r14634 this.collapse_button.text('. . .');
MinRK
third attempt at scrolled long output...
r7362
this.prompt_overlay.addClass('out_prompt_overlay prompt');
Harry Moreno
changed instances of 'outout' to 'output' in alt text's
r9903 this.prompt_overlay.attr('title', 'click to expand output; double click to hide output');
MinRK
third attempt at scrolled long output...
r7362
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.collapse();
};
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 /**
* Should the OutputArea scroll?
* Returns whether the height (in lines) exceeds a threshold.
*
* @private
* @method _should_scroll
* @param [lines=100]{Integer}
* @return {Bool}
*
*/
MinRK
third attempt at scrolled long output...
r7362 OutputArea.prototype._should_scroll = function (lines) {
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 if (lines <=0 ){ return }
MinRK
third attempt at scrolled long output...
r7362 if (!lines) {
MinRK
double auto-scroll threshold to 100 lines...
r7728 lines = 100;
MinRK
third attempt at scrolled long output...
r7362 }
// line-height from http://stackoverflow.com/questions/1185151
var fontSize = this.element.css('font-size');
var lineHeight = Math.floor(parseInt(fontSize.replace('px','')) * 1.5);
return (this.element.height() > lines * lineHeight);
};
OutputArea.prototype.bind_events = function () {
var that = this;
this.prompt_overlay.dblclick(function () { that.toggle_output(); });
this.prompt_overlay.click(function () { that.toggle_scroll(); });
this.element.resize(function () {
MinRK
disable auto-scroll on mozilla...
r7733 // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled
Brian E. Granger
Removing call to $.browser which went away in jQuery 1.9....
r9227 if ( IPython.utils.browser[0] === "Firefox" ) {
MinRK
disable auto-scroll on mozilla...
r7733 return;
}
MinRK
third attempt at scrolled long output...
r7362 // maybe scroll output,
// if it's grown large enough and hasn't already been scrolled.
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 if ( !that.scrolled && that._should_scroll(OutputArea.auto_scroll_threshold)) {
MinRK
third attempt at scrolled long output...
r7362 that.scroll_area();
}
});
this.collapse_button.click(function () {
that.expand();
});
};
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 OutputArea.prototype.collapse = function () {
if (!this.collapsed) {
this.element.hide();
MinRK
third attempt at scrolled long output...
r7362 this.prompt_overlay.hide();
if (this.element.html()){
this.collapse_button.show();
}
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.collapsed = true;
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.expand = function () {
if (this.collapsed) {
MinRK
third attempt at scrolled long output...
r7362 this.collapse_button.hide();
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.element.show();
MinRK
third attempt at scrolled long output...
r7362 this.prompt_overlay.show();
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.collapsed = false;
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.toggle_output = function () {
if (this.collapsed) {
this.expand();
} else {
this.collapse();
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
MinRK
third attempt at scrolled long output...
r7362 OutputArea.prototype.scroll_area = function () {
this.element.addClass('output_scroll');
MinRK
dblclick/double click for humans
r7423 this.prompt_overlay.attr('title', 'click to unscroll output; double click to hide');
MinRK
third attempt at scrolled long output...
r7362 this.scrolled = true;
};
OutputArea.prototype.unscroll_area = function () {
this.element.removeClass('output_scroll');
MinRK
dblclick/double click for humans
r7423 this.prompt_overlay.attr('title', 'click to scroll output; double click to hide');
MinRK
third attempt at scrolled long output...
r7362 this.scrolled = false;
};
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 /**
*
Matthias BUSSONNIER
improve js documentation
r10778 * Scroll OutputArea if height supperior than a threshold (in lines).
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 *
Matthias BUSSONNIER
improve js documentation
r10778 * Threshold is a maximum number of lines. If unspecified, defaults to
Matthias BUSSONNIER
rename scroll_threshold, add minimum_ prefix
r10782 * OutputArea.minimum_scroll_threshold.
Matthias BUSSONNIER
improve js documentation
r10778 *
Matthias BUSSONNIER
document undefined behavior for 0 parameter
r10793 * Negative threshold will prevent the OutputArea from ever scrolling.
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 *
* @method scroll_if_long
Matthias BUSSONNIER
document undefined behavior for 0 parameter
r10793 *
* @param [lines=20]{Number} Default to 20 if not set,
* behavior undefined for value of `0`.
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 *
**/
MinRK
third attempt at scrolled long output...
r7362 OutputArea.prototype.scroll_if_long = function (lines) {
Matthias BUSSONNIER
rename scroll_threshold, add minimum_ prefix
r10782 var n = lines | OutputArea.minimum_scroll_threshold;
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 if(n <= 0){
return
}
if (this._should_scroll(n)) {
MinRK
third attempt at scrolled long output...
r7362 // only allow scrolling long-enough output
this.scroll_area();
Matthias BUSSONNIER
jslint
r9555 }
MinRK
third attempt at scrolled long output...
r7362 };
OutputArea.prototype.toggle_scroll = function () {
if (this.scrolled) {
this.unscroll_area();
} else {
// only allow scrolling long-enough output
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776 this.scroll_if_long();
Matthias BUSSONNIER
jslint
r9555 }
MinRK
third attempt at scrolled long output...
r7362 };
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // typeset with MathJax if MathJax is available
OutputArea.prototype.typeset = function () {
if (window.MathJax){
MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
}
};
MinRK
refactor js callbacks...
r13207 OutputArea.prototype.handle_output = function (msg) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var json = {};
MinRK
refactor js callbacks...
r13207 var msg_type = json.output_type = msg.header.msg_type;
var content = msg.content;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 if (msg_type === "stream") {
json.text = content.data;
json.stream = content.name;
} else if (msg_type === "display_data") {
Paul Ivanov
love them semicolons
r14131 json = content.data;
json.output_type = msg_type;
json.metadata = content.metadata;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 } else if (msg_type === "pyout") {
Paul Ivanov
love them semicolons
r14131 json = content.data;
json.output_type = msg_type;
json.metadata = content.metadata;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 json.prompt_number = content.execution_count;
} else if (msg_type === "pyerr") {
json.ename = content.ename;
json.evalue = content.evalue;
json.traceback = content.traceback;
Matthias BUSSONNIER
jslint
r9555 }
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 this.append_output(json);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Paul Ivanov
use mime type in memory
r14118
MinRK
revert output area changes
r14157
Paul Ivanov
unify key renaming for to/from json short keys
r14124 OutputArea.prototype.rename_keys = function (data, key_map) {
Paul Ivanov
fix toJSON/fromJSON renaming
r14127 var remapped = {};
MinRK
passthrough unrecognized output mime-types...
r14115 for (var key in data) {
Paul Ivanov
unify key renaming for to/from json short keys
r14124 var new_key = key_map[key] || key;
MinRK
revert output area changes
r14157 remapped[new_key] = data[key];
Paul Ivanov
make output code not drop non-mimetype-keyed json
r14112 }
Paul Ivanov
fix toJSON/fromJSON renaming
r14127 return remapped;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
MinRK
validate output types in append_output...
r14158
OutputArea.output_types = [
'application/javascript',
'text/html',
'text/latex',
'image/svg+xml',
'image/png',
'image/jpeg',
Brian E. Granger
Adding basic append_pdf in OutputArea.
r15127 'application/pdf',
MinRK
validate output types in append_output...
r14158 'text/plain'
];
OutputArea.prototype.validate_output = function (json) {
// scrub invalid outputs
// TODO: right now everything is a string, but JSON really shouldn't be.
// nbformat 4 will fix that.
$.map(OutputArea.output_types, function(key){
if (json[key] !== undefined && typeof json[key] !== 'string') {
console.log("Invalid type for " + key, json[key]);
delete json[key];
}
});
return json;
};
MinRK
sign notebooks
r14856
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 OutputArea.prototype.append_output = function (json) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.expand();
Jonathan Frederic
Added wait flag to clear_output.
r12592 // Clear the output if clear is queued.
Jonathan Frederic
Fix scrolling output not working...
r12817 var needs_height_reset = false;
Jonathan Frederic
Added wait flag to clear_output.
r12592 if (this.clear_queued) {
this.clear_output(false);
Jonathan Frederic
Fix scrolling output not working...
r12817 needs_height_reset = true;
Jonathan Frederic
Added wait flag to clear_output.
r12592 }
MinRK
validate output types in append_output...
r14158
// validate output data types
json = this.validate_output(json);
Jonathan Frederic
Added wait flag to clear_output.
r12592
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 if (json.output_type === 'pyout') {
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 this.append_pyout(json);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 } else if (json.output_type === 'pyerr') {
this.append_pyerr(json);
} else if (json.output_type === 'display_data') {
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 this.append_display_data(json);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 } else if (json.output_type === 'stream') {
this.append_stream(json);
Matthias BUSSONNIER
jslint
r9555 }
MinRK
sign notebooks
r14856
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.outputs.push(json);
Jonathan Frederic
Fix scrolling output not working...
r12817
// Only reset the height to automatic if the height is currently
// fixed (done by wait=True flag on clear_output).
if (needs_height_reset) {
Jonathan Frederic
s/'auto'/''
r12878 this.element.height('');
Jonathan Frederic
Fix scrolling output not working...
r12817 }
MinRK
third attempt at scrolled long output...
r7362 var that = this;
setTimeout(function(){that.element.trigger('resize');}, 100);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.create_output_area = function () {
Matthias BUSSONNIER
include hbox in outpuarea css
r10216 var oa = $("<div/>").addClass("output_area");
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 if (this.prompt_area) {
oa.append($('<div/>').addClass('prompt'));
}
return oa;
};
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 function _get_metadata_key(metadata, key, mime) {
var mime_md = metadata[mime];
// mime-specific higher priority
if (mime_md && mime_md[key] !== undefined) {
return mime_md[key];
}
// fallback on global
return metadata[key];
}
OutputArea.prototype.create_output_subarea = function(md, classes, mime) {
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412 var subarea = $('<div/>').addClass('output_subarea').addClass(classes);
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 if (_get_metadata_key(md, 'isolated', mime)) {
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412 // Create an iframe to isolate the subarea from the rest of the
// document
Pablo de Oliveira
Preserve layout for large isolated objects
r13418 var iframe = $('<iframe/>').addClass('box-flex1');
Pablo de Oliveira
Set both height and width using css
r13419 iframe.css({'height':1, 'width':'100%', 'display':'block'});
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412 iframe.attr('frameborder', 0);
iframe.attr('scrolling', 'auto');
// Once the iframe is loaded, the subarea is dynamically inserted
iframe.on('load', function() {
// Workaround needed by Firefox, to properly render svg inside
// iframes, see http://stackoverflow.com/questions/10177190/
// svg-dynamically-added-to-iframe-does-not-render-correctly
this.contentDocument.open();
// Insert the subarea into the iframe
// We must directly write the html. When using Jquery's append
// method, javascript is evaluated in the parent document and
Jonathan Frederic
Audit .html() calls take #2
r15376 // not in the iframe document. At this point, subarea doesn't
// contain any user content.
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412 this.contentDocument.write(subarea.html());
this.contentDocument.close();
var body = this.contentDocument.body;
Pablo de Oliveira
Preserve layout for large isolated objects
r13418 // Adjust the iframe height automatically
Pablo de Oliveira
Support isolated metadata tag for any content...
r13412 iframe.height(body.scrollHeight + 'px');
});
// Elements should be appended to the inner subarea and not to the
// iframe
iframe.append = function(that) {
subarea.append(that);
};
return iframe;
} else {
return subarea;
}
}
Brian E. Granger
Fixing various output related things:...
r13792 OutputArea.prototype._append_javascript_error = function (err, element) {
MinRK
use _safe_append for all output...
r12332 // display a message when a javascript error occurs in display output
var msg = "Javascript error adding output!"
Brian E. Granger
Fixing various output related things:...
r13792 if ( element === undefined ) return;
Jonathan Frederic
Audit .html() calls take #2
r15376 element
.append($('<div/>').text(msg).addClass('js-error'))
.append($('<div/>').text(err.toString()).addClass('js-error'))
.append($('<div/>').text('See your browser Javascript console for more details.').addClass('js-error'));
MinRK
use _safe_append for all output...
r12332 };
OutputArea.prototype._safe_append = function (toinsert) {
// safely append an item to the document
// this is an object created by user code,
// and may have errors, which should not be raised
// under any circumstances.
try {
this.element.append(toinsert);
} catch(err) {
console.log(err);
Brian E. Granger
Fixing various output related things:...
r13792 // Create an actual output_area and output_subarea, which creates
// the prompt area and the proper indentation.
var toinsert = this.create_output_area();
var subarea = $('<div/>').addClass('output_subarea');
toinsert.append(subarea);
this._append_javascript_error(err, subarea);
this.element.append(toinsert);
MinRK
use _safe_append for all output...
r12332 }
};
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 OutputArea.prototype.append_pyout = function (json) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var n = json.prompt_number || ' ';
var toinsert = this.create_output_area();
if (this.prompt_area) {
Matthias BUSSONNIER
some $.html( -> $.text(...
r14634 toinsert.find('div.prompt').addClass('output_prompt').text('Out[' + n + ']:');
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 }
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 this.append_mime_type(json, toinsert);
MinRK
use _safe_append for all output...
r12332 this._safe_append(toinsert);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // If we just output latex, typeset it.
Paul Ivanov
fix mathjax typesetting
r14148 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 this.typeset();
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.append_pyerr = function (json) {
var tb = json.traceback;
if (tb !== undefined && tb.length > 0) {
var s = '';
var len = tb.length;
for (var i=0; i<len; i++) {
s = s + tb[i] + '\n';
}
s = s + '\n';
var toinsert = this.create_output_area();
MinRK
support display_pub metadata in js frontend
r10445 this.append_text(s, {}, toinsert);
MinRK
use _safe_append for all output...
r12332 this._safe_append(toinsert);
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.append_stream = function (json) {
// temporary fix: if stream undefined (json file written prior to this patch),
// default to most likely stdout:
if (json.stream == undefined){
json.stream = 'stdout';
}
Michael Droettboom
Fix rebase.
r7350 var text = json.text;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var subclass = "output_"+json.stream;
if (this.outputs.length > 0){
// have at least one output to consider
var last = this.outputs[this.outputs.length-1];
if (last.output_type == 'stream' && json.stream == last.stream){
// latest output was in the same stream,
// so append directly into its pre tag
// escape ANSI & HTML specials:
Michael Droettboom
Fix rebase.
r7350 var pre = this.element.find('div.'+subclass).last().find('pre');
var html = utils.fixCarriageReturn(
Michael Droettboom
Handle carriage return characters ("\r") in HTML notebook output....
r7339 pre.html() + utils.fixConsole(text));
Jonathan Frederic
s/with with/with
r15406 // The only user content injected with this HTML call is
Jonathan Frederic
Audit .html() calls take #2
r15376 // escaped by the fixConsole() method.
Michael Droettboom
Handle carriage return characters ("\r") in HTML notebook output....
r7339 pre.html(html);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 return;
}
}
Michael Droettboom
Handle carriage return characters ("\r") in HTML notebook output....
r7339
if (!text.replace("\r", "")) {
// text is nothing (empty string, \r, etc.)
// so don't append any elements, which might add undesirable space
return;
}
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // If we got here, attach a new div
var toinsert = this.create_output_area();
MinRK
support display_pub metadata in js frontend
r10445 this.append_text(text, {}, toinsert, "output_stream "+subclass);
MinRK
use _safe_append for all output...
r12332 this._safe_append(toinsert);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 OutputArea.prototype.append_display_data = function (json) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 var toinsert = this.create_output_area();
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 if (this.append_mime_type(json, toinsert)) {
Jonathan Frederic
Fix blank space added by included Javascript on page refresh or notebook load
r13454 this._safe_append(toinsert);
// If we just output latex, typeset it.
Paul Ivanov
fix mathjax typesetting
r14148 if ((json['text/latex'] !== undefined) || (json['text/html'] !== undefined)) {
Jonathan Frederic
Fix blank space added by included Javascript on page refresh or notebook load
r13454 this.typeset();
}
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
MinRK
sign notebooks
r14856 OutputArea.safe_outputs = {
'text/plain' : true,
MinRK
trust latex...
r15643 'text/latex' : true,
MinRK
sign notebooks
r14856 'image/png' : true,
'image/jpeg' : true
};
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 OutputArea.prototype.append_mime_type = function (json, element) {
Paul Ivanov
minor cleanup
r14135 for (var type_i in OutputArea.display_order) {
Matthias BUSSONNIER
display order in output area configurable
r9540 var type = OutputArea.display_order[type_i];
Paul Ivanov
minor cleanup
r14135 var append = OutputArea.append_map[type];
if ((json[type] !== undefined) && append) {
MinRK
sanitize untrusted HTML output...
r15644 var value = json[type];
MinRK
sign notebooks
r14856 if (!this.trusted && !OutputArea.safe_outputs[type]) {
MinRK
sanitize untrusted HTML output...
r15644 // not trusted, sanitize HTML
Brian E. Granger
Display safe HTML+SVG even if untrusted, but don't set trusted=1.
r15634 if (type==='text/html' || type==='text/svg') {
MinRK
sanitize untrusted HTML output...
r15644 value = IPython.security.sanitize_html(value);
} else {
MinRK
remove warning for stripped output
r15658 // don't display if we don't know how to sanitize it
MinRK
log excluded untrusted output
r15661 console.log("Ignoring untrusted " + type + " output.");
Brian E. Granger
Display safe HTML+SVG even if untrusted, but don't set trusted=1.
r15634 continue;
MinRK
sign notebooks
r14856 }
}
Paul Ivanov
love javascript....
r14140 var md = json.metadata || {};
MinRK
sanitize untrusted HTML output...
r15644 var toinsert = append.apply(this, [value, md, element]);
$([IPython.events]).trigger('output_appended.OutputArea', [type, value, md, toinsert]);
Paul Ivanov
minor cleanup
r14135 return true;
Matthias BUSSONNIER
display order in output area configurable
r9540 }
}
Jonathan Frederic
Fix blank space added by included Javascript on page refresh or notebook load
r13454 return false;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_html = function (html, md, element) {
Paul Ivanov
love javascript....
r14140 var type = 'text/html';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
Brian E. Granger
HTML and JavaScript output KBM event handling.
r14035 IPython.keyboard_manager.register_events(toinsert);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 toinsert.append(html);
element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Matthias BUSSONNIER
fix Brian and Min comment
r14884 OutputArea.prototype.append_javascript = function (js, md, element) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // We just eval the JS code, element appears in the local scope.
Paul Ivanov
love javascript....
r14140 var type = 'application/javascript';
Matthias BUSSONNIER
fix Brian and Min comment
r14884 var toinsert = this.create_output_subarea(md, "output_javascript", type);
IPython.keyboard_manager.register_events(toinsert);
element.append(toinsert);
Matthias BUSSONNIER
Fixme comment + whatsnew
r14885 // FIXME TODO : remove `container element for 3.0`
Matthias BUSSONNIER
fix Brian and Min comment
r14884 //backward compat, js should be eval'ed in a context where `container` is defined.
var container = element;
container.show = function(){console.log('Warning "container.show()" is deprecated.')};
Matthias BUSSONNIER
Fixme comment + whatsnew
r14885 // end backward compat
Matthias BUSSONNIER
warn on error when user display javascript
r8071 try {
eval(js);
} catch(err) {
Brian E. Granger
Fixing various output related things:...
r13792 console.log(err);
Matthias BUSSONNIER
fix Brian and Min comment
r14884 this._append_javascript_error(err, toinsert);
Matthias BUSSONNIER
warn on error when user display javascript
r8071 }
Matthias BUSSONNIER
fix Brian and Min comment
r14884 return toinsert;
Matthias BUSSONNIER
jslint
r9555 };
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_text = function (data, md, element, extra_class) {
Paul Ivanov
love javascript....
r14140 var type = 'text/plain';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_text", type);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // escape ANSI & HTML specials in plaintext:
data = utils.fixConsole(data);
Michael Droettboom
Handle carriage return characters ("\r") in HTML notebook output....
r7339 data = utils.fixCarriageReturn(data);
Erik M. Bray
Locate URLs in text output and convert them to hyperlinks.
r8528 data = utils.autoLinkUrls(data);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 if (extra_class){
toinsert.addClass(extra_class);
}
Jonathan Frederic
s/with with/with
r15406 // The only user content injected with this HTML call is
Jonathan Frederic
Audit .html() calls take #2
r15376 // escaped by the fixConsole() method.
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 toinsert.append($("<pre/>").html(data));
element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_svg = function (svg, md, element) {
Paul Ivanov
love javascript....
r14140 var type = 'image/svg+xml';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_svg", type);
Brian Granger
Removing resizable SVGs from output.
r7355 toinsert.append(svg);
element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
MinRK
use chained delay for setting resizable images
r7601 OutputArea.prototype._dblclick_to_reset_size = function (img) {
MinRK
use on-load event to trigger resizable images...
r15551 // wrap image after it's loaded on the page,
// otherwise the measured initial size will be incorrect
img.on("load", function (){
MinRK
use chained delay for setting resizable images
r7601 var h0 = img.height();
var w0 = img.width();
if (!(h0 && w0)) {
MinRK
use on-load event to trigger resizable images...
r15551 // zero size, don't make it resizable
Matthias BUSSONNIER
jslint
r9555 return;
MinRK
use chained delay for setting resizable images
r7601 }
MinRK
dblclick to restore size of images
r7599 img.resizable({
aspectRatio: true,
MinRK
use chained delay for setting resizable images
r7601 autoHide: true
});
img.dblclick(function () {
// resize wrapper & image together for some reason:
img.parent().height(h0);
img.height(h0);
img.parent().width(w0);
img.width(w0);
MinRK
dblclick to restore size of images
r7599 });
MinRK
use on-load event to trigger resizable images...
r15551 });
Matthias BUSSONNIER
jslint
r9555 };
MinRK
fix setting image height/width from metadata
r14727
var set_width_height = function (img, md, mime) {
// set width and height of an img element from metadata
var height = _get_metadata_key(md, 'height', mime);
MinRK
use jQuery attr instead of setAttribute...
r14807 if (height !== undefined) img.attr('height', height);
MinRK
fix setting image height/width from metadata
r14727 var width = _get_metadata_key(md, 'width', mime);
MinRK
use jQuery attr instead of setAttribute...
r14807 if (width !== undefined) img.attr('width', width);
MinRK
fix setting image height/width from metadata
r14727 };
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_png = function (png, md, element) {
Paul Ivanov
love javascript....
r14140 var type = 'image/png';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_png", type);
MinRK
use jQuery attr instead of setAttribute...
r14807 var img = $("<img/>").attr('src','data:image/png;base64,'+png);
set_width_height(img, md, 'image/png');
MinRK
use chained delay for setting resizable images
r7601 this._dblclick_to_reset_size(img);
Brian Granger
Make svg, jpeg and png images resizable in notebook.
r7352 toinsert.append(img);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_jpeg = function (jpeg, md, element) {
Paul Ivanov
love javascript....
r14140 var type = 'image/jpeg';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_jpeg", type);
Brian Granger
Make svg, jpeg and png images resizable in notebook.
r7352 var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
MinRK
use jQuery attr instead of setAttribute...
r14807 set_width_height(img, md, 'image/jpeg');
MinRK
use chained delay for setting resizable images
r7601 this._dblclick_to_reset_size(img);
Brian Granger
Make svg, jpeg and png images resizable in notebook.
r7352 toinsert.append(img);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Brian E. Granger
Adding basic append_pdf in OutputArea.
r15127 OutputArea.prototype.append_pdf = function (pdf, md, element) {
var type = 'application/pdf';
var toinsert = this.create_output_subarea(md, "output_pdf", type);
var a = $('<a/>').attr('href', 'data:application/pdf;base64,'+pdf);
a.attr('target', '_blank');
a.text('View PDF')
toinsert.append(a);
element.append(toinsert);
return toinsert;
}
Paul Ivanov
hardcode type into the mimetype specific functions
r14133 OutputArea.prototype.append_latex = function (latex, md, element) {
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 // This method cannot do the typesetting because the latex first has to
// be on the page.
Paul Ivanov
love javascript....
r14140 var type = 'text/latex';
Paul Ivanov
check mime-keyed metadata first, then top level
r14116 var toinsert = this.create_output_subarea(md, "output_latex", type);
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 toinsert.append(latex);
element.append(toinsert);
Matthias BUSSONNIER
emit event when mimetype are append to output area.
r14883 return toinsert;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
Matthias BUSSONNIER
Use different threshold for (auto)scroll in output...
r10776
Paul Ivanov
dispatch on mime type for append methods
r14132
MinRK
refactor js callbacks...
r13207 OutputArea.prototype.append_raw_input = function (msg) {
MinRK
cleanup stdin event submission...
r10370 var that = this;
MinRK
use inline raw_input instead of a dialog
r10368 this.expand();
MinRK
refactor js callbacks...
r13207 var content = msg.content;
MinRK
use inline raw_input instead of a dialog
r10368 var area = this.create_output_area();
MinRK
remove any lingering raw_inputs on raw_input...
r11612
// disable any other raw_inputs, if they are left around
$("div.output_subarea.raw_input").remove();
MinRK
use inline raw_input instead of a dialog
r10368 area.append(
$("<div/>")
.addClass("box-flex1 output_subarea raw_input")
.append(
MinRK
cleanup stdin event submission...
r10370 $("<span/>")
.addClass("input_prompt")
.text(content.prompt)
)
.append(
$("<input/>")
.addClass("raw_input")
.attr('type', 'text')
MinRK
fix raw_input...
r10934 .attr("size", 47)
MinRK
cleanup stdin event submission...
r10370 .keydown(function (event, ui) {
// make sure we submit on enter,
// and don't re-execute the *cell* on shift-enter
Brian E. Granger
Removing old keyboard handling from IPython.utils.
r15619 if (event.which === IPython.keyboard.keycodes.enter) {
MinRK
cleanup stdin event submission...
r10370 that._submit_raw_input();
return false;
}
})
MinRK
use inline raw_input instead of a dialog
r10368 )
MinRK
cleanup stdin event submission...
r10370 );
Brian E. Granger
Fix raw_input.
r14046
MinRK
use inline raw_input instead of a dialog
r10368 this.element.append(area);
Brian E. Granger
Fix raw_input.
r14046 var raw_input = area.find('input.raw_input');
// Register events that enable/disable the keyboard manager while raw
// input is focused.
IPython.keyboard_manager.register_events(raw_input);
// Note, the following line used to read raw_input.focus().focus().
// This seemed to be needed otherwise only the cell would be focused.
// But with the modal UI, this seems to work fine with one call to focus().
raw_input.focus();
MinRK
use inline raw_input instead of a dialog
r10368 }
Brian E. Granger
Fix raw_input.
r14046
MinRK
use inline raw_input instead of a dialog
r10368 OutputArea.prototype._submit_raw_input = function (evt) {
var container = this.element.find("div.raw_input");
var theprompt = container.find("span.input_prompt");
var theinput = container.find("input.raw_input");
MinRK
fix raw_input...
r10934 var value = theinput.val();
MinRK
use inline raw_input instead of a dialog
r10368 var content = {
output_type : 'stream',
name : 'stdout',
text : theprompt.text() + value + '\n'
}
// remove form container
container.parent().remove();
// replace with plaintext version in stdout
this.append_output(content, false);
$([IPython.events]).trigger('send_input_reply.Kernel', value);
}
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177
MinRK
refactor js callbacks...
r13207 OutputArea.prototype.handle_clear_output = function (msg) {
MinRK
note v4.1 msg spec change in clear_output handler
r14977 // msg spec v4 had stdout, stderr, display keys
// v4.1 replaced these with just wait
// The default behavior is the same (stdout=stderr=display=True, wait=False),
// so v4 messages will still be properly handled,
// except for the rarely used clearing less than all output.
this.clear_output(msg.content.wait || false);
Matthias BUSSONNIER
jslint
r9555 };
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177
Jonathan Frederic
Added wait flag to clear_output.
r12592 OutputArea.prototype.clear_output = function(wait) {
if (wait) {
Jonathan Frederic
Remove clear_output timeout callback in favor of fixed height
r12582
Jonathan Frederic
Added wait flag to clear_output.
r12592 // If a clear is queued, clear before adding another to the queue.
if (this.clear_queued) {
this.clear_output(false);
};
this.clear_queued = true;
} else {
Jonathan Frederic
Don't preserve height when clear_output(wait=False) is called
r12606 // Fix the output div's height if the clear_output is waiting for
// new output (it is being used in an animation).
if (this.clear_queued) {
var height = this.element.height();
this.element.height(height);
this.clear_queued = false;
}
Jonathan Frederic
Added wait flag to clear_output.
r12592 // clear all, no need for logic
this.element.html("");
this.outputs = [];
MinRK
sign notebooks
r14856 this.trusted = true;
Jonathan Frederic
Added wait flag to clear_output.
r12592 this.unscroll_area();
return;
};
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
// JSON serialization
OutputArea.prototype.fromJSON = function (outputs) {
var len = outputs.length;
Paul Ivanov
fix toJSON/fromJSON renaming
r14127 var data;
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 for (var i=0; i<len; i++) {
Paul Ivanov
fix stream saving
r14130 data = outputs[i];
var msg_type = data.output_type;
Paul Ivanov
convert short names like 'png' to mimetype names
r14120 if (msg_type === "display_data" || msg_type === "pyout") {
Paul Ivanov
convert back to short names when writing to JSON
r14123 // convert short keys to mime keys
Paul Ivanov
fix small bug in dropping metadata
r14136 // TODO: remove mapping of short keys when we update to nbformat 4
Paul Ivanov
fix stream saving
r14130 data = this.rename_keys(data, OutputArea.mime_map_r);
data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map_r);
Paul Ivanov
convert short names like 'png' to mimetype names
r14120 }
Paul Ivanov
remove dynamic keyword, handling it in fromJSON...
r14134 this.append_output(data);
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 };
OutputArea.prototype.toJSON = function () {
var outputs = [];
var len = this.outputs.length;
Paul Ivanov
fix toJSON/fromJSON renaming
r14127 var data;
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 for (var i=0; i<len; i++) {
Paul Ivanov
fix stream saving
r14130 data = this.outputs[i];
var msg_type = data.output_type;
Paul Ivanov
convert back to short names when writing to JSON
r14123 if (msg_type === "display_data" || msg_type === "pyout") {
// convert mime keys to short keys
Paul Ivanov
fix stream saving
r14130 data = this.rename_keys(data, OutputArea.mime_map);
Paul Ivanov
fix small bug in dropping metadata
r14136 data.metadata = this.rename_keys(data.metadata, OutputArea.mime_map);
Paul Ivanov
convert back to short names when writing to JSON
r14123 }
outputs[i] = data;
Matthias BUSSONNIER
jslint
r9555 }
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177 return outputs;
};
Matthias BUSSONNIER
put OutputArea map at the end
r14985 /**
* Class properties
**/
/**
* Threshold to trigger autoscroll when the OutputArea is resized,
* typically when new outputs are added.
*
* Behavior is undefined if autoscroll is lower than minimum_scroll_threshold,
* unless it is < 0, in which case autoscroll will never be triggered
*
* @property auto_scroll_threshold
* @type Number
* @default 100
*
**/
OutputArea.auto_scroll_threshold = 100;
/**
* Lower limit (in lines) for OutputArea to be made scrollable. OutputAreas
* shorter than this are never scrolled.
*
* @property minimum_scroll_threshold
* @type Number
* @default 20
*
**/
OutputArea.minimum_scroll_threshold = 20;
OutputArea.mime_map = {
"text/plain" : "text",
"text/html" : "html",
"image/svg+xml" : "svg",
"image/png" : "png",
"image/jpeg" : "jpeg",
"text/latex" : "latex",
"application/json" : "json",
"application/javascript" : "javascript",
};
OutputArea.mime_map_r = {
"text" : "text/plain",
"html" : "text/html",
"svg" : "image/svg+xml",
"png" : "image/png",
"jpeg" : "image/jpeg",
"latex" : "text/latex",
"json" : "application/json",
"javascript" : "application/javascript",
};
OutputArea.display_order = [
'application/javascript',
'text/html',
'text/latex',
'image/svg+xml',
'image/png',
'image/jpeg',
Brian E. Granger
Adding basic append_pdf in OutputArea.
r15127 'application/pdf',
Matthias BUSSONNIER
put OutputArea map at the end
r14985 'text/plain'
];
OutputArea.append_map = {
"text/plain" : OutputArea.prototype.append_text,
"text/html" : OutputArea.prototype.append_html,
"image/svg+xml" : OutputArea.prototype.append_svg,
"image/png" : OutputArea.prototype.append_png,
"image/jpeg" : OutputArea.prototype.append_jpeg,
"text/latex" : OutputArea.prototype.append_latex,
"application/javascript" : OutputArea.prototype.append_javascript,
Brian E. Granger
Adding basic append_pdf in OutputArea.
r15127 "application/pdf" : OutputArea.prototype.append_pdf
Matthias BUSSONNIER
put OutputArea map at the end
r14985 };
Brian Granger
Refactored CodeCell to use new OutputArea object for output....
r7177
IPython.OutputArea = OutputArea;
return IPython;
}(IPython));