Show More
@@ -82,10 +82,10 b' define([' | |||||
82 | this.cell = cell; |
|
82 | this.cell = cell; | |
83 | this.editor = cell.code_mirror; |
|
83 | this.editor = cell.code_mirror; | |
84 | var that = this; |
|
84 | var that = this; | |
85 |
events.on(' |
|
85 | events.on('kernel_busy.Kernel', function () { | |
86 | that.skip_kernel_completion = true; |
|
86 | that.skip_kernel_completion = true; | |
87 | }); |
|
87 | }); | |
88 |
events.on(' |
|
88 | events.on('kernel_idle.Kernel', function () { | |
89 | that.skip_kernel_completion = false; |
|
89 | that.skip_kernel_completion = false; | |
90 | }); |
|
90 | }); | |
91 | }; |
|
91 | }; |
@@ -128,20 +128,20 b' define([' | |||||
128 | knw.info("Kernel Created", 500); |
|
128 | knw.info("Kernel Created", 500); | |
129 | }); |
|
129 | }); | |
130 |
|
130 | |||
131 |
this.events.on(' |
|
131 | this.events.on('kernel_reconnecting.Kernel', function () { | |
132 | knw.warning("Connecting to kernel"); |
|
132 | knw.warning("Connecting to kernel"); | |
133 | }); |
|
133 | }); | |
134 |
|
134 | |||
135 |
this.events.on(' |
|
135 | this.events.on('kernel_connected.Kernel', function () { | |
136 | knw.info("Connected", 500); |
|
136 | knw.info("Connected", 500); | |
137 | }); |
|
137 | }); | |
138 |
|
138 | |||
139 |
this.events.on(' |
|
139 | this.events.on('kernel_restarting.Kernel', function () { | |
140 | that.save_widget.update_document_title(); |
|
140 | that.save_widget.update_document_title(); | |
141 | knw.set_message("Restarting kernel", 2000); |
|
141 | knw.set_message("Restarting kernel", 2000); | |
142 | }); |
|
142 | }); | |
143 |
|
143 | |||
144 |
this.events.on(' |
|
144 | this.events.on('kernel_autorestarting.Kernel', function (evt, info) { | |
145 | // Only show the dialog on the first restart attempt. This |
|
145 | // Only show the dialog on the first restart attempt. This | |
146 | // number gets tracked by the `Kernel` object and passed |
|
146 | // number gets tracked by the `Kernel` object and passed | |
147 | // along here, because we don't want to show the user 5 |
|
147 | // along here, because we don't want to show the user 5 | |
@@ -167,17 +167,17 b' define([' | |||||
167 | $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); |
|
167 | $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); | |
168 | }); |
|
168 | }); | |
169 |
|
169 | |||
170 |
this.events.on(' |
|
170 | this.events.on('kernel_interrupting.Kernel', function () { | |
171 | knw.set_message("Interrupting kernel", 2000); |
|
171 | knw.set_message("Interrupting kernel", 2000); | |
172 | }); |
|
172 | }); | |
173 |
|
173 | |||
174 |
this.events.on(' |
|
174 | this.events.on('kernel_disconnected.Kernel', function () { | |
175 | $kernel_ind_icon |
|
175 | $kernel_ind_icon | |
176 | .attr('class', 'kernel_disconnected_icon') |
|
176 | .attr('class', 'kernel_disconnected_icon') | |
177 | .attr('title', 'No Connection to Kernel'); |
|
177 | .attr('title', 'No Connection to Kernel'); | |
178 | }); |
|
178 | }); | |
179 |
|
179 | |||
180 | this.events.on('connection_failed.Kernel', function (evt, info) { |
|
180 | this.events.on('kernel_connection_failed.Kernel', function (evt, info) { | |
181 | // only show the dialog if this is the first failed |
|
181 | // only show the dialog if this is the first failed | |
182 | // connect attempt, because the kernel will continue |
|
182 | // connect attempt, because the kernel will continue | |
183 | // trying to reconnect and we don't want to spam the user |
|
183 | // trying to reconnect and we don't want to spam the user | |
@@ -201,7 +201,7 b' define([' | |||||
201 | } |
|
201 | } | |
202 | }); |
|
202 | }); | |
203 |
|
203 | |||
204 |
this.events.on(' |
|
204 | this.events.on('kernel_killed.Kernel kernel_killed.Session', function () { | |
205 | that.save_widget.update_document_title(); |
|
205 | that.save_widget.update_document_title(); | |
206 | knw.danger("Dead kernel"); |
|
206 | knw.danger("Dead kernel"); | |
207 | $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); |
|
207 | $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead'); | |
@@ -285,24 +285,24 b' define([' | |||||
285 | knw.danger(short, undefined, showMsg); |
|
285 | knw.danger(short, undefined, showMsg); | |
286 | }); |
|
286 | }); | |
287 |
|
287 | |||
288 |
this.events.on(' |
|
288 | this.events.on('kernel_starting.Kernel', function () { | |
289 | window.document.title='(Starting) '+window.document.title; |
|
289 | window.document.title='(Starting) '+window.document.title; | |
290 | $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); |
|
290 | $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); | |
291 | knw.set_message("Kernel starting, please wait..."); |
|
291 | knw.set_message("Kernel starting, please wait..."); | |
292 | }); |
|
292 | }); | |
293 |
|
293 | |||
294 |
this.events.on(' |
|
294 | this.events.on('kernel_ready.Kernel', function () { | |
295 | that.save_widget.update_document_title(); |
|
295 | that.save_widget.update_document_title(); | |
296 | $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); |
|
296 | $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); | |
297 | knw.info("Kernel ready", 500); |
|
297 | knw.info("Kernel ready", 500); | |
298 | }); |
|
298 | }); | |
299 |
|
299 | |||
300 |
this.events.on(' |
|
300 | this.events.on('kernel_idle.Kernel', function () { | |
301 | that.save_widget.update_document_title(); |
|
301 | that.save_widget.update_document_title(); | |
302 | $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); |
|
302 | $kernel_ind_icon.attr('class','kernel_idle_icon').attr('title','Kernel Idle'); | |
303 | }); |
|
303 | }); | |
304 |
|
304 | |||
305 |
this.events.on(' |
|
305 | this.events.on('kernel_busy.Kernel', function () { | |
306 | window.document.title='(Busy) '+window.document.title; |
|
306 | window.document.title='(Busy) '+window.document.title; | |
307 | $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); |
|
307 | $kernel_ind_icon.attr('class','kernel_busy_icon').attr('title','Kernel Busy'); | |
308 | }); |
|
308 | }); |
@@ -91,19 +91,19 b' define([' | |||||
91 | element: "#kernel_indicator", |
|
91 | element: "#kernel_indicator", | |
92 | title: "Kernel Indicator", |
|
92 | title: "Kernel Indicator", | |
93 | placement: 'bottom', |
|
93 | placement: 'bottom', | |
94 |
onShow: function(tour) { events.trigger(' |
|
94 | onShow: function(tour) { events.trigger('kernel_idle.Kernel');}, | |
95 | content: "This is the Kernel indicator. It looks like this when the Kernel is idle." |
|
95 | content: "This is the Kernel indicator. It looks like this when the Kernel is idle." | |
96 | }, { |
|
96 | }, { | |
97 | element: "#kernel_indicator", |
|
97 | element: "#kernel_indicator", | |
98 | title: "Kernel Indicator", |
|
98 | title: "Kernel Indicator", | |
99 | placement: 'bottom', |
|
99 | placement: 'bottom', | |
100 |
onShow: function(tour) { events.trigger(' |
|
100 | onShow: function(tour) { events.trigger('kernel_busy.Kernel'); }, | |
101 | content: "The Kernel indicator looks like this when the Kernel is busy." |
|
101 | content: "The Kernel indicator looks like this when the Kernel is busy." | |
102 | }, { |
|
102 | }, { | |
103 | element: ".fa-stop", |
|
103 | element: ".fa-stop", | |
104 | placement: 'bottom', |
|
104 | placement: 'bottom', | |
105 | title: "Interrupting the Kernel", |
|
105 | title: "Interrupting the Kernel", | |
106 |
onHide: function(tour) { events.trigger(' |
|
106 | onHide: function(tour) { events.trigger('kernel_idle.Kernel'); }, | |
107 | content: "To cancel a computation in progress, you can click here." |
|
107 | content: "To cancel a computation in progress, you can click here." | |
108 | }, { |
|
108 | }, { | |
109 | element: "#notification_kernel", |
|
109 | element: "#notification_kernel", |
@@ -99,25 +99,25 b' define([' | |||||
99 | }; |
|
99 | }; | |
100 |
|
100 | |||
101 | this.events.on('kernel_created.Kernel', record_status); |
|
101 | this.events.on('kernel_created.Kernel', record_status); | |
102 |
this.events.on(' |
|
102 | this.events.on('kernel_reconnecting.Kernel', record_status); | |
103 |
this.events.on(' |
|
103 | this.events.on('kernel_connected.Kernel', record_status); | |
104 |
this.events.on(' |
|
104 | this.events.on('kernel_starting.Kernel', record_status); | |
105 |
this.events.on(' |
|
105 | this.events.on('kernel_restarting.Kernel', record_status); | |
106 |
this.events.on(' |
|
106 | this.events.on('kernel_autorestarting.Kernel', record_status); | |
107 |
this.events.on(' |
|
107 | this.events.on('kernel_interrupting.Kernel', record_status); | |
108 |
this.events.on(' |
|
108 | this.events.on('kernel_disconnected.Kernel', record_status); | |
109 | // these are commented out because they are triggered a lot, but can |
|
109 | // these are commented out because they are triggered a lot, but can | |
110 | // be uncommented for debugging purposes |
|
110 | // be uncommented for debugging purposes | |
111 |
//this.events.on(' |
|
111 | //this.events.on('kernel_idle.Kernel', record_status); | |
112 |
//this.events.on(' |
|
112 | //this.events.on('kernel_busy.Kernel', record_status); | |
113 |
this.events.on(' |
|
113 | this.events.on('kernel_ready.Kernel', record_status); | |
114 |
this.events.on(' |
|
114 | this.events.on('kernel_killed.Kernel', record_status); | |
115 | this.events.on('kernel_dead.Kernel', record_status); |
|
115 | this.events.on('kernel_dead.Kernel', record_status); | |
116 |
|
116 | |||
117 |
this.events.on(' |
|
117 | this.events.on('kernel_ready.Kernel', function () { | |
118 | that._autorestart_attempt = 0; |
|
118 | that._autorestart_attempt = 0; | |
119 | }); |
|
119 | }); | |
120 |
this.events.on(' |
|
120 | this.events.on('kernel_connected.Kernel', function () { | |
121 | that._reconnect_attempt = 0; |
|
121 | that._reconnect_attempt = 0; | |
122 | }); |
|
122 | }); | |
123 | }; |
|
123 | }; | |
@@ -236,7 +236,7 b' define([' | |||||
236 | * @param {function} [error] - functon executed on ajax error |
|
236 | * @param {function} [error] - functon executed on ajax error | |
237 | */ |
|
237 | */ | |
238 | Kernel.prototype.kill = function (success, error) { |
|
238 | Kernel.prototype.kill = function (success, error) { | |
239 |
this.events.trigger(' |
|
239 | this.events.trigger('kernel_killed.Kernel', {kernel: this}); | |
240 | this._kernel_dead(); |
|
240 | this._kernel_dead(); | |
241 | $.ajax(this.kernel_url, { |
|
241 | $.ajax(this.kernel_url, { | |
242 | processData: false, |
|
242 | processData: false, | |
@@ -258,7 +258,7 b' define([' | |||||
258 | * @param {function} [error] - functon executed on ajax error |
|
258 | * @param {function} [error] - functon executed on ajax error | |
259 | */ |
|
259 | */ | |
260 | Kernel.prototype.interrupt = function (success, error) { |
|
260 | Kernel.prototype.interrupt = function (success, error) { | |
261 |
this.events.trigger(' |
|
261 | this.events.trigger('kernel_interrupting.Kernel', {kernel: this}); | |
262 |
|
262 | |||
263 | var that = this; |
|
263 | var that = this; | |
264 | var on_success = function (data, status, xhr) { |
|
264 | var on_success = function (data, status, xhr) { | |
@@ -290,7 +290,7 b' define([' | |||||
290 | * @param {function} [error] - functon executed on ajax error |
|
290 | * @param {function} [error] - functon executed on ajax error | |
291 | */ |
|
291 | */ | |
292 | Kernel.prototype.restart = function (success, error) { |
|
292 | Kernel.prototype.restart = function (success, error) { | |
293 |
this.events.trigger(' |
|
293 | this.events.trigger('kernel_restarting.Kernel', {kernel: this}); | |
294 | this.stop_channels(); |
|
294 | this.stop_channels(); | |
295 |
|
295 | |||
296 | var that = this; |
|
296 | var that = this; | |
@@ -329,7 +329,7 b' define([' | |||||
329 | * @function reconnect |
|
329 | * @function reconnect | |
330 | */ |
|
330 | */ | |
331 | Kernel.prototype.reconnect = function () { |
|
331 | Kernel.prototype.reconnect = function () { | |
332 |
this.events.trigger(' |
|
332 | this.events.trigger('kernel_reconnecting.Kernel', {kernel: this}); | |
333 | setTimeout($.proxy(this.start_channels, this), 3000); |
|
333 | setTimeout($.proxy(this.start_channels, this), 3000); | |
334 | }; |
|
334 | }; | |
335 |
|
335 | |||
@@ -392,12 +392,12 b' define([' | |||||
392 | * @function _kernel_connected |
|
392 | * @function _kernel_connected | |
393 | */ |
|
393 | */ | |
394 | Kernel.prototype._kernel_connected = function () { |
|
394 | Kernel.prototype._kernel_connected = function () { | |
395 |
this.events.trigger(' |
|
395 | this.events.trigger('kernel_connected.Kernel', {kernel: this}); | |
396 |
this.events.trigger(' |
|
396 | this.events.trigger('kernel_starting.Kernel', {kernel: this}); | |
397 | // get kernel info so we know what state the kernel is in |
|
397 | // get kernel info so we know what state the kernel is in | |
398 | var that = this; |
|
398 | var that = this; | |
399 | this.kernel_info(function () { |
|
399 | this.kernel_info(function () { | |
400 |
that.events.trigger(' |
|
400 | that.events.trigger('kernel_ready.Kernel', {kernel: this}); | |
401 | }); |
|
401 | }); | |
402 | }; |
|
402 | }; | |
403 |
|
403 | |||
@@ -520,11 +520,11 b' define([' | |||||
520 | Kernel.prototype._ws_closed = function(ws_url, error) { |
|
520 | Kernel.prototype._ws_closed = function(ws_url, error) { | |
521 | this.stop_channels(); |
|
521 | this.stop_channels(); | |
522 |
|
522 | |||
523 |
this.events.trigger(' |
|
523 | this.events.trigger('kernel_disconnected.Kernel', {kernel: this}); | |
524 | if (error) { |
|
524 | if (error) { | |
525 | console.log('WebSocket connection failed: ', ws_url); |
|
525 | console.log('WebSocket connection failed: ', ws_url); | |
526 | this._reconnect_attempt = this._reconnect_attempt + 1; |
|
526 | this._reconnect_attempt = this._reconnect_attempt + 1; | |
527 | this.events.trigger('connection_failed.Kernel', {kernel: this, ws_url: ws_url, attempt: this._reconnect_attempt}); |
|
527 | this.events.trigger('kernel_connection_failed.Kernel', {kernel: this, ws_url: ws_url, attempt: this._reconnect_attempt}); | |
528 | } |
|
528 | } | |
529 | this.reconnect(); |
|
529 | this.reconnect(); | |
530 | }; |
|
530 | }; | |
@@ -909,7 +909,7 b' define([' | |||||
909 | } |
|
909 | } | |
910 |
|
910 | |||
911 | if (execution_state === 'busy') { |
|
911 | if (execution_state === 'busy') { | |
912 |
this.events.trigger(' |
|
912 | this.events.trigger('kernel_busy.Kernel', {kernel: this}); | |
913 |
|
913 | |||
914 | } else if (execution_state === 'idle') { |
|
914 | } else if (execution_state === 'idle') { | |
915 | // signal that iopub callbacks are (probably) done |
|
915 | // signal that iopub callbacks are (probably) done | |
@@ -918,23 +918,23 b' define([' | |||||
918 | this._finish_iopub(parent_id); |
|
918 | this._finish_iopub(parent_id); | |
919 |
|
919 | |||
920 | // trigger status_idle event |
|
920 | // trigger status_idle event | |
921 |
this.events.trigger(' |
|
921 | this.events.trigger('kernel_idle.Kernel', {kernel: this}); | |
922 |
|
922 | |||
923 | } else if (execution_state === 'starting') { |
|
923 | } else if (execution_state === 'starting') { | |
924 |
this.events.trigger(' |
|
924 | this.events.trigger('kernel_starting.Kernel', {kernel: this}); | |
925 | var that = this; |
|
925 | var that = this; | |
926 | this.kernel_info(function () { |
|
926 | this.kernel_info(function () { | |
927 |
that.events.trigger(' |
|
927 | that.events.trigger('kernel_ready.Kernel', {kernel: this}); | |
928 | }); |
|
928 | }); | |
929 |
|
929 | |||
930 | } else if (execution_state === 'restarting') { |
|
930 | } else if (execution_state === 'restarting') { | |
931 | // autorestarting is distinct from restarting, |
|
931 | // autorestarting is distinct from restarting, | |
932 | // in that it means the kernel died and the server is restarting it. |
|
932 | // in that it means the kernel died and the server is restarting it. | |
933 |
// |
|
933 | // kernel_restarting sets the notification widget, | |
934 | // autorestart shows the more prominent dialog. |
|
934 | // autorestart shows the more prominent dialog. | |
935 | this._autorestart_attempt = this._autorestart_attempt + 1; |
|
935 | this._autorestart_attempt = this._autorestart_attempt + 1; | |
936 |
this.events.trigger(' |
|
936 | this.events.trigger('kernel_restarting.Kernel', {kernel: this}); | |
937 |
this.events.trigger(' |
|
937 | this.events.trigger('kernel_autorestarting.Kernel', {kernel: this, attempt: this._autorestart_attempt}); | |
938 |
|
938 | |||
939 | } else if (execution_state === 'dead') { |
|
939 | } else if (execution_state === 'dead') { | |
940 | this.events.trigger('kernel_dead.Kernel', {kernel: this}); |
|
940 | this.events.trigger('kernel_dead.Kernel', {kernel: this}); |
@@ -56,7 +56,7 b' define([' | |||||
56 |
|
56 | |||
57 | this.events.on('kernel_created.Session', record_status); |
|
57 | this.events.on('kernel_created.Session', record_status); | |
58 | this.events.on('kernel_dead.Session', record_status); |
|
58 | this.events.on('kernel_dead.Session', record_status); | |
59 |
this.events.on(' |
|
59 | this.events.on('kernel_killed.Session', record_status); | |
60 |
|
60 | |||
61 | // if the kernel dies, then also remove the session |
|
61 | // if the kernel dies, then also remove the session | |
62 | this.events.on('kernel_dead.Kernel', function () { |
|
62 | this.events.on('kernel_dead.Kernel', function () { | |
@@ -189,7 +189,7 b' define([' | |||||
189 | */ |
|
189 | */ | |
190 | Session.prototype.delete = function (success, error) { |
|
190 | Session.prototype.delete = function (success, error) { | |
191 | if (this.kernel) { |
|
191 | if (this.kernel) { | |
192 |
this.events.trigger(' |
|
192 | this.events.trigger('kernel_killed.Session', {session: this, kernel: this.kernel}); | |
193 | this.kernel._kernel_dead(); |
|
193 | this.kernel._kernel_dead(); | |
194 | } |
|
194 | } | |
195 |
|
195 |
@@ -162,11 +162,11 b' casper.notebook_test(function () {' | |||||
162 | this.event_test( |
|
162 | this.event_test( | |
163 | 'kill/start', |
|
163 | 'kill/start', | |
164 | [ |
|
164 | [ | |
165 |
' |
|
165 | 'kernel_killed.Kernel', | |
166 | 'kernel_created.Kernel', |
|
166 | 'kernel_created.Kernel', | |
167 |
' |
|
167 | 'kernel_connected.Kernel', | |
168 |
' |
|
168 | 'kernel_starting.Kernel', | |
169 |
' |
|
169 | 'kernel_ready.Kernel' | |
170 | ], |
|
170 | ], | |
171 | function () { |
|
171 | function () { | |
172 | this.thenEvaluate(function () { |
|
172 | this.thenEvaluate(function () { | |
@@ -185,8 +185,8 b' casper.notebook_test(function () {' | |||||
185 | this.event_test( |
|
185 | this.event_test( | |
186 | 'reconnect', |
|
186 | 'reconnect', | |
187 | [ |
|
187 | [ | |
188 |
' |
|
188 | 'kernel_reconnecting.Kernel', | |
189 |
' |
|
189 | 'kernel_connected.Kernel', | |
190 | ], |
|
190 | ], | |
191 | function () { |
|
191 | function () { | |
192 | this.thenEvaluate(function () { |
|
192 | this.thenEvaluate(function () { | |
@@ -202,11 +202,11 b' casper.notebook_test(function () {' | |||||
202 | this.event_test( |
|
202 | this.event_test( | |
203 | 'restart', |
|
203 | 'restart', | |
204 | [ |
|
204 | [ | |
205 |
' |
|
205 | 'kernel_restarting.Kernel', | |
206 | 'kernel_created.Kernel', |
|
206 | 'kernel_created.Kernel', | |
207 |
' |
|
207 | 'kernel_connected.Kernel', | |
208 |
' |
|
208 | 'kernel_starting.Kernel', | |
209 |
' |
|
209 | 'kernel_ready.Kernel' | |
210 | ], |
|
210 | ], | |
211 | function () { |
|
211 | function () { | |
212 | this.thenEvaluate(function () { |
|
212 | this.thenEvaluate(function () { | |
@@ -221,9 +221,9 b' casper.notebook_test(function () {' | |||||
221 | this.event_test( |
|
221 | this.event_test( | |
222 | 'interrupt', |
|
222 | 'interrupt', | |
223 | [ |
|
223 | [ | |
224 |
' |
|
224 | 'kernel_interrupting.Kernel', | |
225 |
' |
|
225 | 'kernel_busy.Kernel', | |
226 |
' |
|
226 | 'kernel_idle.Kernel' | |
227 | ], |
|
227 | ], | |
228 | function () { |
|
228 | function () { | |
229 | this.thenEvaluate(function () { |
|
229 | this.thenEvaluate(function () { | |
@@ -237,11 +237,11 b' casper.notebook_test(function () {' | |||||
237 | this.event_test( |
|
237 | this.event_test( | |
238 | 'ws_closed_ok', |
|
238 | 'ws_closed_ok', | |
239 | [ |
|
239 | [ | |
240 |
' |
|
240 | 'kernel_disconnected.Kernel', | |
241 |
' |
|
241 | 'kernel_reconnecting.Kernel', | |
242 |
' |
|
242 | 'kernel_connected.Kernel', | |
243 |
' |
|
243 | 'kernel_busy.Kernel', | |
244 |
' |
|
244 | 'kernel_idle.Kernel' | |
245 | ], |
|
245 | ], | |
246 | function () { |
|
246 | function () { | |
247 | this.thenEvaluate(function () { |
|
247 | this.thenEvaluate(function () { | |
@@ -256,8 +256,8 b' casper.notebook_test(function () {' | |||||
256 | this.event_test( |
|
256 | this.event_test( | |
257 | 'ws_closed_error', |
|
257 | 'ws_closed_error', | |
258 | [ |
|
258 | [ | |
259 |
' |
|
259 | 'kernel_disconnected.Kernel', | |
260 | 'connection_failed.Kernel' |
|
260 | 'kernel_connection_failed.Kernel' | |
261 | ], |
|
261 | ], | |
262 | function () { |
|
262 | function () { | |
263 | this.thenEvaluate(function () { |
|
263 | this.thenEvaluate(function () { | |
@@ -277,8 +277,8 b' casper.notebook_test(function () {' | |||||
277 | this.event_test( |
|
277 | this.event_test( | |
278 | 'autorestarting', |
|
278 | 'autorestarting', | |
279 | [ |
|
279 | [ | |
280 |
' |
|
280 | 'kernel_restarting.Kernel', | |
281 |
' |
|
281 | 'kernel_autorestarting.Kernel', | |
282 | ], |
|
282 | ], | |
283 | function () { |
|
283 | function () { | |
284 | this.thenEvaluate(function () { |
|
284 | this.thenEvaluate(function () { | |
@@ -294,8 +294,8 b' casper.notebook_test(function () {' | |||||
294 | this.event_test( |
|
294 | this.event_test( | |
295 | 'failed_restart', |
|
295 | 'failed_restart', | |
296 | [ |
|
296 | [ | |
297 |
' |
|
297 | 'kernel_restarting.Kernel', | |
298 |
' |
|
298 | 'kernel_autorestarting.Kernel', | |
299 | 'kernel_dead.Kernel' |
|
299 | 'kernel_dead.Kernel' | |
300 | ], |
|
300 | ], | |
301 | function () { |
|
301 | function () { |
@@ -99,9 +99,9 b' casper.notebook_test(function () {' | |||||
99 | 'start_session', |
|
99 | 'start_session', | |
100 | [ |
|
100 | [ | |
101 | 'kernel_created.Session', |
|
101 | 'kernel_created.Session', | |
102 |
' |
|
102 | 'kernel_connected.Kernel', | |
103 |
' |
|
103 | 'kernel_starting.Kernel', | |
104 |
' |
|
104 | 'kernel_ready.Kernel' | |
105 | ], |
|
105 | ], | |
106 | function () { |
|
106 | function () { | |
107 | this.thenEvaluate(function () { |
|
107 | this.thenEvaluate(function () { | |
@@ -114,7 +114,7 b' casper.notebook_test(function () {' | |||||
114 | // check for events when killing the session |
|
114 | // check for events when killing the session | |
115 | this.event_test( |
|
115 | this.event_test( | |
116 | 'delete_session', |
|
116 | 'delete_session', | |
117 |
[' |
|
117 | ['kernel_killed.Session'], | |
118 | function () { |
|
118 | function () { | |
119 | this.thenEvaluate(function () { |
|
119 | this.thenEvaluate(function () { | |
120 | IPython.notebook.session.delete(); |
|
120 | IPython.notebook.session.delete(); | |
@@ -126,11 +126,11 b' casper.notebook_test(function () {' | |||||
126 | this.event_test( |
|
126 | this.event_test( | |
127 | 'restart_session', |
|
127 | 'restart_session', | |
128 | [ |
|
128 | [ | |
129 |
' |
|
129 | 'kernel_killed.Session', | |
130 | 'kernel_created.Session', |
|
130 | 'kernel_created.Session', | |
131 |
' |
|
131 | 'kernel_connected.Kernel', | |
132 |
' |
|
132 | 'kernel_starting.Kernel', | |
133 |
' |
|
133 | 'kernel_ready.Kernel' | |
134 | ], |
|
134 | ], | |
135 | function () { |
|
135 | function () { | |
136 | this.thenEvaluate(function () { |
|
136 | this.thenEvaluate(function () { | |
@@ -144,9 +144,9 b' casper.notebook_test(function () {' | |||||
144 | this.event_test( |
|
144 | this.event_test( | |
145 | 'failed_restart', |
|
145 | 'failed_restart', | |
146 | [ |
|
146 | [ | |
147 |
' |
|
147 | 'kernel_restarting.Kernel', | |
148 |
' |
|
148 | 'kernel_autorestarting.Kernel', | |
149 |
' |
|
149 | 'kernel_killed.Session', | |
150 | 'kernel_dead.Kernel', |
|
150 | 'kernel_dead.Kernel', | |
151 | ], |
|
151 | ], | |
152 | function () { |
|
152 | function () { | |
@@ -170,7 +170,7 b' casper.notebook_test(function () {' | |||||
170 | this.event_test( |
|
170 | this.event_test( | |
171 | 'bad_start_session', |
|
171 | 'bad_start_session', | |
172 | [ |
|
172 | [ | |
173 |
' |
|
173 | 'kernel_killed.Session', | |
174 | 'kernel_dead.Session' |
|
174 | 'kernel_dead.Session' | |
175 | ], |
|
175 | ], | |
176 | function () { |
|
176 | function () { |
@@ -28,10 +28,10 b' casper.open_new_notebook = function () {' | |||||
28 | this.thenEvaluate(function () { |
|
28 | this.thenEvaluate(function () { | |
29 | require(['base/js/namespace', 'base/js/events'], function (IPython, events) { |
|
29 | require(['base/js/namespace', 'base/js/events'], function (IPython, events) { | |
30 |
|
30 | |||
31 |
events.on(' |
|
31 | events.on('kernel_idle.Kernel',function () { | |
32 | IPython._status = 'idle'; |
|
32 | IPython._status = 'idle'; | |
33 | }); |
|
33 | }); | |
34 |
events.on(' |
|
34 | events.on('kernel_busy.Kernel',function () { | |
35 | IPython._status = 'busy'; |
|
35 | IPython._status = 'busy'; | |
36 | }); |
|
36 | }); | |
37 | }); |
|
37 | }); |
General Comments 0
You need to be logged in to leave comments.
Login now