From 19e4b746785294a04f939c7e39cca4b9e5b1419d Mon Sep 17 00:00:00 2001 From: MinRK <benjaminrk@gmail.com> Date: Wed, 11 Dec 2013 11:54:07 -0800 Subject: [PATCH] revert output area changes --- IPython/html/static/notebook/js/outputarea.js | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js index a284cc725..d4ac863a0 100644 --- a/IPython/html/static/notebook/js/outputarea.js +++ b/IPython/html/static/notebook/js/outputarea.js @@ -276,31 +276,15 @@ var IPython = (function (IPython) { "json" : "application/json", "javascript" : "application/javascript", }; - - OutputArea.prototype._safe_set_mime = function (src, dest, srckey, destkey) { - destkey = destkey || srckey; - - var value = src[srckey]; - if (value !== undefined) { - // For now, everything is a string, - // but JSON should really not be double-serialized. - if (typeof value !== 'string') { - console.log("Invalid type for " + destkey, value); - } else { - dest[destkey] = value; - } - } - }; - + OutputArea.prototype.rename_keys = function (data, key_map) { var remapped = {}; for (var key in data) { var new_key = key_map[key] || key; - this._safe_set_mime(data, remapped, key, new_key); + remapped[new_key] = data[key]; } return remapped; }; - OutputArea.prototype.append_output = function (json) { this.expand();