Merge pull request #5295 from minrk/no-append-prototype

OutputArea.append_type functions are not prototype methods
ipython · Mar 10, 2014 · 18300d5 · 18300d5
2 parents fa0a8b8 + eb99c80
commit 18300d5
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js
@@ -425,7 +425,10 @@ var IPython = (function (IPython) {
             }
             s = s + '\n';
             var toinsert = this.create_output_area();
-            this.append_text(s, {}, toinsert).addClass('output_pyerr');
+            var append_text = OutputArea.append_map['text/plain'];
+            if (append_text) {
+                append_text.apply(this, [s, {}, toinsert]).addClass('output_pyerr');
+            }
             this._safe_append(toinsert);
         }
     };
@@ -434,7 +437,7 @@ var IPython = (function (IPython) {
     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){
+        if (json.stream === undefined){
             json.stream = 'stdout';
         }
         var text = json.text;
@@ -464,7 +467,10 @@ var IPython = (function (IPython) {
 
         // If we got here, attach a new div
         var toinsert = this.create_output_area();
-        this.append_text(text, {}, toinsert).addClass("output_stream "+subclass);
+        var append_text = OutputArea.append_map['text/plain'];
+        if (append_text) {
+            append_text.apply(this, [text, {}, toinsert]).addClass("output_stream " + subclass);
+        }
         this._safe_append(toinsert);
     };
 
@@ -514,7 +520,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_html = function (html, md, element) {
+    var append_html = function (html, md, element) {
         var type = 'text/html';
         var toinsert = this.create_output_subarea(md, "output_html rendered_html", type);
         IPython.keyboard_manager.register_events(toinsert);
@@ -524,7 +530,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_javascript = function (js, md, element) {
+    var append_javascript = function (js, md, element) {
         // We just eval the JS code, element appears in the local scope.
         var type = 'application/javascript';
         var toinsert = this.create_output_subarea(md, "output_javascript", type);
@@ -545,7 +551,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_text = function (data, md, element) {
+    var append_text = function (data, md, element) {
         var type = 'text/plain';
         var toinsert = this.create_output_subarea(md, "output_text", type);
         // escape ANSI & HTML specials in plaintext:
@@ -560,7 +566,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_svg = function (svg, md, element) {
+    var append_svg = function (svg, md, element) {
         var type = 'image/svg+xml';
         var toinsert = this.create_output_subarea(md, "output_svg", type);
         toinsert.append(svg);
@@ -601,7 +607,7 @@ var IPython = (function (IPython) {
         if (width !== undefined) img.attr('width', width);
     };
 
-    OutputArea.prototype.append_png = function (png, md, element) {
+    var append_png = function (png, md, element) {
         var type = 'image/png';
         var toinsert = this.create_output_subarea(md, "output_png", type);
         var img = $("<img/>").attr('src','data:image/png;base64,'+png);
@@ -613,7 +619,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_jpeg = function (jpeg, md, element) {
+    var append_jpeg = function (jpeg, md, element) {
         var type = 'image/jpeg';
         var toinsert = this.create_output_subarea(md, "output_jpeg", type);
         var img = $("<img/>").attr('src','data:image/jpeg;base64,'+jpeg);
@@ -625,7 +631,7 @@ var IPython = (function (IPython) {
     };
 
 
-    OutputArea.prototype.append_pdf = function (pdf, md, element) {
+    var 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);
@@ -636,7 +642,7 @@ var IPython = (function (IPython) {
         return toinsert;
      }
 
-    OutputArea.prototype.append_latex = function (latex, md, element) {
+    var append_latex = function (latex, md, element) {
         // This method cannot do the typesetting because the latex first has to
         // be on the page.
         var type = 'text/latex';
@@ -851,14 +857,14 @@ var IPython = (function (IPython) {
     ];
 
     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,
-        "application/pdf" : OutputArea.prototype.append_pdf
+        "text/plain" : append_text,
+        "text/html" : append_html,
+        "image/svg+xml" : append_svg,
+        "image/png" : append_png,
+        "image/jpeg" : append_jpeg,
+        "text/latex" : append_latex,
+        "application/javascript" : append_javascript,
+        "application/pdf" : append_pdf
     };
 
     IPython.OutputArea = OutputArea;