Show More
@@ -253,8 +253,8 b" define(['require'" | |||||
253 | env.notebook.delete_cell(); |
|
253 | env.notebook.delete_cell(); | |
254 | } |
|
254 | } | |
255 | }, |
|
255 | }, | |
256 | 'toggle-unsolicited-message-display':{ |
|
256 | 'show-other-output':{ | |
257 |
help: ' |
|
257 | help: 'show/ignore output from other clients', | |
258 | icon: 'fa-sitemap', |
|
258 | icon: 'fa-sitemap', | |
259 | help_index: 'gb', |
|
259 | help_index: 'gb', | |
260 | handler: function (env) { |
|
260 | handler: function (env) { |
@@ -95,7 +95,7 b' define([' | |||||
95 | 'space' : 'ipython.scroll-down', |
|
95 | 'space' : 'ipython.scroll-down', | |
96 | 'down' : 'ipython.select-next-cell', |
|
96 | 'down' : 'ipython.select-next-cell', | |
97 | 'i,i' : 'ipython.interrupt-kernel', |
|
97 | 'i,i' : 'ipython.interrupt-kernel', | |
98 |
'e': 'ipython. |
|
98 | 'e': 'ipython.show-other-output', | |
99 | '0,0' : 'ipython.restart-kernel', |
|
99 | '0,0' : 'ipython.restart-kernel', | |
100 | 'd,d' : 'ipython.delete-cell', |
|
100 | 'd,d' : 'ipython.delete-cell', | |
101 | 'esc': 'ipython.close-pager', |
|
101 | 'esc': 'ipython.close-pager', |
@@ -137,7 +137,7 b' define([' | |||||
137 | this.undelete_below = false; |
|
137 | this.undelete_below = false; | |
138 | this.paste_enabled = false; |
|
138 | this.paste_enabled = false; | |
139 | this.writable = false; |
|
139 | this.writable = false; | |
140 | this.ignore_unsolicited_msgs = false; |
|
140 | this.include_other_output = true; | |
141 | // It is important to start out in command mode to match the intial mode |
|
141 | // It is important to start out in command mode to match the intial mode | |
142 | // of the KeyboardManager. |
|
142 | // of the KeyboardManager. | |
143 | this.mode = 'command'; |
|
143 | this.mode = 'command'; | |
@@ -1579,10 +1579,10 b' define([' | |||||
1579 | * @method toggle_ignore_unsolicited_msgs |
|
1579 | * @method toggle_ignore_unsolicited_msgs | |
1580 | */ |
|
1580 | */ | |
1581 | Notebook.prototype.toggle_ignore_unsolicited_msgs = function () { |
|
1581 | Notebook.prototype.toggle_ignore_unsolicited_msgs = function () { | |
1582 | this.ignore_unsolicited_msgs = !this.ignore_unsolicited_msgs; |
|
1582 | this.include_other_output = !this.include_other_output; | |
1583 |
this.events.trigger('toggle_ |
|
1583 | this.events.trigger('toggle_other_client_output.Notebook', | |
1584 |
[this.i |
|
1584 | [this.include_other_output]); | |
1585 |
return this.i |
|
1585 | return this.include_other_output; | |
1586 | }; |
|
1586 | }; | |
1587 |
|
1587 | |||
1588 | /** |
|
1588 | /** | |
@@ -1593,7 +1593,7 b' define([' | |||||
1593 | * @method handle_unsolicited_msg |
|
1593 | * @method handle_unsolicited_msg | |
1594 | */ |
|
1594 | */ | |
1595 | Notebook.prototype.handle_unsolicited_msg = function(msg) { |
|
1595 | Notebook.prototype.handle_unsolicited_msg = function(msg) { | |
1596 |
if (this.i |
|
1596 | if (!this.include_other_output) { | |
1597 | return; |
|
1597 | return; | |
1598 | } |
|
1598 | } | |
1599 | if (msg.msg_type == 'execute_input') { |
|
1599 | if (msg.msg_type == 'execute_input') { |
@@ -279,9 +279,9 b' define([' | |||||
279 | nnw.warning(error.message || "Notebook copy failed"); |
|
279 | nnw.warning(error.message || "Notebook copy failed"); | |
280 | }); |
|
280 | }); | |
281 |
|
281 | |||
282 | this.events.on('toggle_unsolicited_msgs.Notebook', function(evt, ignored) { |
|
|||
283 | var msg = (ignored? "Ignoring": "Showing") + " I/O from external clients"; |
|
|||
284 | nnw.set_message(msg, 1000); |
|
282 | nnw.set_message(msg, 1000); | |
|
283 | this.events.on('toggle_other_client_output.Notebook', function(evt, ignored) { | |||
|
284 | var msg = (ignored? "Ignoring": "Showing") + " output from other clients"; | |||
285 | }); |
|
285 | }); | |
286 |
|
286 | |||
287 | // Checkpoint events |
|
287 | // Checkpoint events |
@@ -229,8 +229,8 b' class="notebook_app"' | |||||
229 | <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Kernel</a> |
|
229 | <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Kernel</a> | |
230 | <ul id="kernel_menu" class="dropdown-menu"> |
|
230 | <ul id="kernel_menu" class="dropdown-menu"> | |
231 | <li id="toggle_unsolicited" |
|
231 | <li id="toggle_unsolicited" | |
232 |
title="Toggle display of |
|
232 | title="Toggles display of messages from clients other than this one sharing the same kernel."> | |
233 |
<a href="#">Show/ignore |
|
233 | <a href="#">Show/ignore output from other clients.</a></li> | |
234 | <li id="int_kernel" |
|
234 | <li id="int_kernel" | |
235 | title="Send KeyboardInterrupt (CTRL-C) to the Kernel"> |
|
235 | title="Send KeyboardInterrupt (CTRL-C) to the Kernel"> | |
236 | <a href="#">Interrupt</a> |
|
236 | <a href="#">Interrupt</a> |
General Comments 0
You need to be logged in to leave comments.
Login now