##// END OF EJS Templates
Merge pull request #5602 from jasongrout/kernel-js-post...
Jonathan Frederic -
r16408:347f2de9 merge
parent child Browse files
Show More
@@ -35,6 +35,7 b' var IPython = (function (IPython) {'
35 this.username = "username";
35 this.username = "username";
36 this.session_id = utils.uuid();
36 this.session_id = utils.uuid();
37 this._msg_callbacks = {};
37 this._msg_callbacks = {};
38 this.post = $.post;
38
39
39 if (typeof(WebSocket) !== 'undefined') {
40 if (typeof(WebSocket) !== 'undefined') {
40 this.WebSocket = WebSocket;
41 this.WebSocket = WebSocket;
@@ -94,7 +95,7 b' var IPython = (function (IPython) {'
94 params = params || {};
95 params = params || {};
95 if (!this.running) {
96 if (!this.running) {
96 var qs = $.param(params);
97 var qs = $.param(params);
97 $.post(utils.url_join_encode(this.kernel_service_url) + '?' + qs,
98 this.post(utils.url_join_encode(this.kernel_service_url) + '?' + qs,
98 $.proxy(this._kernel_started, this),
99 $.proxy(this._kernel_started, this),
99 'json'
100 'json'
100 );
101 );
@@ -113,7 +114,7 b' var IPython = (function (IPython) {'
113 $([IPython.events]).trigger('status_restarting.Kernel', {kernel: this});
114 $([IPython.events]).trigger('status_restarting.Kernel', {kernel: this});
114 if (this.running) {
115 if (this.running) {
115 this.stop_channels();
116 this.stop_channels();
116 $.post(utils.url_join_encode(this.kernel_url, "restart"),
117 this.post(utils.url_join_encode(this.kernel_url, "restart"),
117 $.proxy(this._kernel_started, this),
118 $.proxy(this._kernel_started, this),
118 'json'
119 'json'
119 );
120 );
@@ -386,7 +387,7 b' var IPython = (function (IPython) {'
386 Kernel.prototype.interrupt = function () {
387 Kernel.prototype.interrupt = function () {
387 if (this.running) {
388 if (this.running) {
388 $([IPython.events]).trigger('status_interrupting.Kernel', {kernel: this});
389 $([IPython.events]).trigger('status_interrupting.Kernel', {kernel: this});
389 $.post(utils.url_join_encode(this.kernel_url, "interrupt"));
390 this.post(utils.url_join_encode(this.kernel_url, "interrupt"));
390 }
391 }
391 };
392 };
392
393
General Comments 0
You need to be logged in to leave comments. Login now