From 8d2012331dcce495cb420d46a14ea9232e84f368 2014-01-12 21:54:46
From: Paul Ivanov <pi@berkeley.edu>
Date: 2014-01-12 21:54:46
Subject: [PATCH] stop using convert_to_mime_types

the in-memory representation and the messsage spec now all use mimetype
names for the JSON keys.

---

diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js
index 289858a..364d709 100644
--- a/IPython/html/static/notebook/js/outputarea.js
+++ b/IPython/html/static/notebook/js/outputarea.js
@@ -239,12 +239,14 @@ var IPython = (function (IPython) {
             json.text = content.data;
             json.stream = content.name;
         } else if (msg_type === "display_data") {
-            json = this.convert_mime_types(json, content.data);
-            json.metadata = this.convert_mime_types({}, content.metadata);
+            json = content.data
+            json.output_type = msg_type
+            json.metadata = content.metadata
         } else if (msg_type === "pyout") {
+            json = content.data
+            json.output_type = msg_type
+            json.metadata = content.metadata
             json.prompt_number = content.execution_count;
-            json = this.convert_mime_types(json, content.data);
-            json.metadata = this.convert_mime_types({}, content.metadata);
         } else if (msg_type === "pyerr") {
             json.ename = content.ename;
             json.evalue = content.evalue;