##// END OF EJS Templates
Merge pull request #6693 from minrk/please-no-jsonp...
Matthias Bussonnier -
r18389:2df21de1 merge
parent child Browse files
Show More
@@ -1941,7 +1941,7 b' define(['
1941 cache : false,
1941 cache : false,
1942 type : "PUT",
1942 type : "PUT",
1943 data : JSON.stringify(model),
1943 data : JSON.stringify(model),
1944 headers : {'Content-Type': 'application/json'},
1944 contentType: 'application/json',
1945 dataType : "json",
1945 dataType : "json",
1946 success : $.proxy(this.save_notebook_success, this, start),
1946 success : $.proxy(this.save_notebook_success, this, start),
1947 error : $.proxy(this.save_notebook_error, this)
1947 error : $.proxy(this.save_notebook_error, this)
@@ -2158,7 +2158,7 b' define(['
2158 type : "PATCH",
2158 type : "PATCH",
2159 data : JSON.stringify(data),
2159 data : JSON.stringify(data),
2160 dataType: "json",
2160 dataType: "json",
2161 headers : {'Content-Type': 'application/json'},
2161 contentType: 'application/json',
2162 success : $.proxy(that.rename_success, this),
2162 success : $.proxy(that.rename_success, this),
2163 error : $.proxy(that.rename_error, this)
2163 error : $.proxy(that.rename_error, this)
2164 };
2164 };
@@ -434,7 +434,7 b' define(['
434 cache : false,
434 cache : false,
435 type : 'PUT',
435 type : 'PUT',
436 data : JSON.stringify(model),
436 data : JSON.stringify(model),
437 headers : {'Content-Type': content_type},
437 contentType: content_type,
438 success : function (data, status, xhr) {
438 success : function (data, status, xhr) {
439 item.removeClass('new-file');
439 item.removeClass('new-file');
440 that.add_link(model, item);
440 that.add_link(model, item);
@@ -8,7 +8,9 b' casper.notebook_test(function () {'
8 // This causes no actual problems, but will break string comparison.
8 // This causes no actual problems, but will break string comparison.
9 var nbname = "has#hash and space and unicø∂e.ipynb";
9 var nbname = "has#hash and space and unicø∂e.ipynb";
10
10
11 this.evaluate(function (nbname) {
11 this.append_cell("s = '??'", 'code');
12
13 this.thenEvaluate(function (nbname) {
12 require(['base/js/events'], function (events) {
14 require(['base/js/events'], function (events) {
13 IPython.notebook.notebook_name = nbname;
15 IPython.notebook.notebook_name = nbname;
14 IPython._save_success = IPython._save_failed = false;
16 IPython._save_success = IPython._save_failed = false;
General Comments 0
You need to be logged in to leave comments. Login now