mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

make output code not drop non-mimetype-keyed json

Browse Source
This commit is contained in:
Paul Ivanov 2013-11-25 17:09:12 -08:00
parent 5fefd65d72
commit 2e72ab3cd6
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IPython/html/static/notebook/js/outputarea.js
View File

@ -254,6 +254,9 @@ var IPython = (function (IPython) {
this.append_output(json, true);
};
var mime_types = ['application/javascript', 'application/json',
'image/jpeg', 'image/png', 'image/svg+xml', 'text/html',
'text/latex', 'text/plain'];
OutputArea.prototype.convert_mime_types = function (json, data) {
if (data === undefined) {
@ -283,6 +286,13 @@ var IPython = (function (IPython) {
if (data['application/javascript'] !== undefined) {
json.javascript = data['application/javascript'];
}
// non-mimetype-keyed metadata used to get dropped here, this code
// re-injects it into the json.
for (x in data){
if( !(x in mime_types) ) {
json[x] = data[x];
}
}
return json;
};

26
IPython/html/tests/casperjs/test_cases/isolated_svg.js
View File

@ -21,6 +21,32 @@ casper.notebook_test(function () {
+ "display_svg(SVG(s2), metadata=dict(isolated=True))\n"
);
cell.execute();
console.log("hello" );
});
this.then(function() {
var fname=this.test.currentTestFile.split('/').pop().toLowerCase();
this.echo(fname)
this.echo(this.currentUrl)
this.evaluate(function (n) {
IPython.notebook.rename(n);
console.write("hello" + n);
IPython.notebook.save_notebook();
}, {n : fname});
this.echo(this.currentUrl)
});
this.then(function() {
url = this.evaluate(function() {
IPython.notebook.rename("foo");
//$("span#notebook_name")[0].click();
//$("input")[0].value = "please-work";
//$(".btn-primary")[0].click();
return document.location.href;
})
this.echo("renamed" + url);
this.echo(this.currentUrl);
});
this.wait_for_output(0);