Removed ability to clear stdout and stderr individually.

pull/37/head
Jonathan Frederic 13 years ago
parent 2b6add80f1
commit 00f0c827e9

@ -240,7 +240,7 @@ var IPython = (function (IPython) {
* @method execute
*/
CodeCell.prototype.execute = function () {
this.output_area.clear_output(true, true, true);
this.output_area.clear_output();
this.set_input_prompt('*');
this.element.addClass("running");
var callbacks = {
@ -386,8 +386,8 @@ var IPython = (function (IPython) {
};
CodeCell.prototype.clear_output = function (stdout, stderr, other) {
this.output_area.clear_output(stdout, stderr, other);
CodeCell.prototype.clear_output = function () {
this.output_area.clear_output();
};

@ -1339,7 +1339,7 @@ var IPython = (function (IPython) {
var cells = this.get_cells();
for (var i=0; i<ncells; i++) {
if (cells[i] instanceof IPython.CodeCell) {
cells[i].clear_output(true,true,true);
cells[i].clear_output();
// Make all In[] prompts blank, as well
// TODO: make this configurable (via checkbox?)
cells[i].set_input_prompt();

@ -605,52 +605,21 @@ var IPython = (function (IPython) {
OutputArea.prototype.handle_clear_output = function (content) {
this.clear_output(content.stdout, content.stderr, content.other);
this.clear_output();
};
OutputArea.prototype.clear_output = function (stdout, stderr, other) {
var output_div = this.element;
OutputArea.prototype.clear_output = function() {
// Fix the output div's height
var height = output_div.height();
output_div.height(height);
var height = this.element.height();
this.element.height(height);
if (stdout && stderr && other){
// clear all, no need for logic
output_div.html("");
this.outputs = [];
this.unscroll_area();
return;
}
// remove html output
// each output_subarea that has an identifying class is in an output_area
// which is the element to be removed.
if (stdout) {
output_div.find("div.output_stdout").parent().remove();
}
if (stderr) {
output_div.find("div.output_stderr").parent().remove();
}
if (other) {
output_div.find("div.output_subarea").not("div.output_stderr").not("div.output_stdout").parent().remove();
}
// clear all, no need for logic
this.element.html("");
this.outputs = [];
this.unscroll_area();
// remove cleared outputs from JSON list:
for (var i = this.outputs.length - 1; i >= 0; i--) {
var out = this.outputs[i];
var output_type = out.output_type;
if (output_type == "display_data" && other) {
this.outputs.splice(i,1);
} else if (output_type == "stream") {
if (stdout && out.stream == "stdout") {
this.outputs.splice(i,1);
} else if (stderr && out.stream == "stderr") {
this.outputs.splice(i,1);
}
}
}
return;
};

Loading…
Cancel
Save