##// END OF EJS Templates
Merge pull request #4476 from jdfreder/rm_js_blankspace_onload...
Min RK -
r13485:df9a41c5 merge
parent child Browse files
Show More
@@ -290,7 +290,6 var IPython = (function (IPython) {
290 OutputArea.prototype.append_output = function (json, dynamic) {
290 OutputArea.prototype.append_output = function (json, dynamic) {
291 // If dynamic is true, javascript output will be eval'd.
291 // If dynamic is true, javascript output will be eval'd.
292 this.expand();
292 this.expand();
293
294 // Clear the output if clear is queued.
293 // Clear the output if clear is queued.
295 var needs_height_reset = false;
294 var needs_height_reset = false;
296 if (this.clear_queued) {
295 if (this.clear_queued) {
@@ -425,11 +424,12 var IPython = (function (IPython) {
425
424
426 OutputArea.prototype.append_display_data = function (json, dynamic) {
425 OutputArea.prototype.append_display_data = function (json, dynamic) {
427 var toinsert = this.create_output_area();
426 var toinsert = this.create_output_area();
428 this.append_mime_type(json, toinsert, dynamic);
427 if (this.append_mime_type(json, toinsert, dynamic)) {
429 this._safe_append(toinsert);
428 this._safe_append(toinsert);
430 // If we just output latex, typeset it.
429 // If we just output latex, typeset it.
431 if ( (json.latex !== undefined) || (json.html !== undefined) ) {
430 if ( (json.latex !== undefined) || (json.html !== undefined) ) {
432 this.typeset();
431 this.typeset();
432 }
433 }
433 }
434 };
434 };
435
435
@@ -446,13 +446,16 var IPython = (function (IPython) {
446 if(type == 'javascript'){
446 if(type == 'javascript'){
447 if (dynamic) {
447 if (dynamic) {
448 this.append_javascript(json.javascript, md, element, dynamic);
448 this.append_javascript(json.javascript, md, element, dynamic);
449 return true;
449 }
450 }
450 } else {
451 } else {
451 this['append_'+type](json[type], md, element);
452 this['append_'+type](json[type], md, element);
453 return true;
452 }
454 }
453 return;
455 return false;
454 }
456 }
455 }
457 }
458 return false;
456 };
459 };
457
460
458
461
General Comments 0
You need to be logged in to leave comments. Login now