Merge pull request #7357 from jdfreder/error-overlay

When executing a cell, clear output and ignore queued animations.
This commit is contained in:
Matthias Bussonnier 2015-01-01 10:59:30 +01:00
commit 1e6f969c39
2 changed files with 3 additions and 3 deletions

View File

@ -416,7 +416,7 @@ define([
return;
}
this.active_output_area.clear_output();
this.active_output_area.clear_output(false, true);
// Clear widget area
for (var i = 0; i < this.widget_views.length; i++) {

View File

@ -850,7 +850,7 @@ define([
};
OutputArea.prototype.clear_output = function(wait) {
OutputArea.prototype.clear_output = function(wait, ignore_que) {
if (wait) {
// If a clear is queued, clear before adding another to the queue.
@ -863,7 +863,7 @@ define([
// 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) {
if (!ignore_que && this.clear_queued) {
var height = this.element.height();
this.element.height(height);
this.clear_queued = false;