mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert PR #1659

Browse Source 
caused critical problems with subprocess output.

See `!ls` for an example.
This commit is contained in:
MinRK 2012-04-29 23:52:04 -07:00
parent 721e83a61e
commit 97151aa3b8
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IPython/frontend/html/notebook/static/js/codecell.js
View File

@ -623,8 +623,11 @@ var IPython = (function (IPython) {
if (json.stream == undefined){
json.stream = 'stdout';
}
var text = utils.fixConsole(json.text);
if (!utils.fixConsole(json.text)){
// fixConsole gives nothing (empty string, \r, etc.)
// so don't append any elements, which might add undesirable space
return;
}
var subclass = "output_"+json.stream;
if (this.outputs.length > 0){
// have at least one output to consider
@ -633,22 +636,15 @@ var IPython = (function (IPython) {
// latest output was in the same stream,
// so append directly into its pre tag
// escape ANSI & HTML specials:
pre = this.element.find('div.'+subclass).last().find('pre');
text = utils.fixCarriageReturn(pre.text() + text);
pre.text(text);
var text = utils.fixConsole(json.text);
this.element.find('div.'+subclass).last().find('pre').append(text);
return;
}
}
if (!text.replace("\r", "")) {
// text is nothing (empty string, \r, etc.)
// so don't append any elements, which might add undesirable space
return;
}
// If we got here, attach a new div
var toinsert = this.create_output_area();
this.append_text(text, toinsert, "output_stream "+subclass);
this.append_text(json.text, toinsert, "output_stream "+subclass);
this.element.find('div.output').append(toinsert);
};
@ -706,7 +702,6 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("box_flex1 output_subarea output_text");
// escape ANSI & HTML specials in plaintext:
data = utils.fixConsole(data);
data = utils.fixCarriageReturn(data);
if (extra_class){
toinsert.addClass(extra_class);
}

4
IPython/frontend/html/notebook/static/js/pager.js
View File

@ -89,9 +89,9 @@ var IPython = (function (IPython) {
Pager.prototype.append_text = function (text) {
var toinsert = $("<div/>").addClass("output_area output_stream");
toinsert.append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
toinsert.append($('<pre/>').html(utils.fixConsole(text)));
this.pager_element.append(toinsert);
};
};
IPython.Pager = Pager;

17
IPython/frontend/html/notebook/static/js/utils.js
View File

@ -47,7 +47,7 @@ IPython.utils = (function (IPython) {
"37":"ansigrey", "01":"ansibold"
};
// Transform ANSI color escape codes into HTML <span> tags with css
// Transform ANI color escape codes into HTML <span> tags with css
// classes listed in the above ansi_colormap object. The actual color used
// are set in the css file.
function fixConsole(txt) {
@ -57,6 +57,8 @@ IPython.utils = (function (IPython) {
var cmds = [];
var opener = "";
var closer = "";
// \r does nothing, so shouldn't be included
txt = txt.replace('\r', '');
while (re.test(txt)) {
var cmds = txt.match(re)[1].split(";");
closer = opened?"</span>":"";
@ -72,16 +74,6 @@ IPython.utils = (function (IPython) {
return txt;
}
// Remove chunks that should be overridden by the effect of
// carriage return characters
function fixCarriageReturn(txt) {
tmp = txt;
do {
txt = tmp;
tmp = txt.replace(/^.*\r/gm, '');
} while (tmp.length < txt.length);
return txt;
}
grow = function(element) {
// Grow the cell by hand. This is used upon reloading from JSON, when the
@ -103,8 +95,7 @@ IPython.utils = (function (IPython) {
return {
uuid : uuid,
fixConsole : fixConsole,
grow : grow,
fixCarriageReturn : fixCarriageReturn
grow : grow
};
}(IPython));