From 459b5ea7ad24337caeb72ea494445104ff5617c7 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Mon, 25 Nov 2013 17:43:25 -0800 Subject: [PATCH] use non-mimetype-keyed metadata in the outputarea --- IPython/html/static/notebook/js/outputarea.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js index 87c7eeb31..3ce702363 100644 --- a/IPython/html/static/notebook/js/outputarea.js +++ b/IPython/html/static/notebook/js/outputarea.js @@ -498,9 +498,19 @@ var IPython = (function (IPython) { var type = OutputArea.display_order[type_i]; if(json[type] != undefined ){ var md = {}; - if (json.metadata && json.metadata[type]) { - md = json.metadata[type]; - }; + if (json.metadata) { + md = json.metadata; + if (json.metadata[type]) { + // XXX: need some sort of dict.update, style here if + // we want to support the merging of the overall + // metadata with the mimetype specific metadata. For + // now, they are mutually exclusive - if the + // mimetype-keyed metadata exists, *it* is used, + // otherwise, only the message-wide metadata is + // available. + md = json.metadata[type]; + } + } if(type == 'javascript'){ if (dynamic) { this.append_javascript(json.javascript, md, element, dynamic);