diff --git a/IPython/html/static/notebook/js/actions.js b/IPython/html/static/notebook/js/actions.js index db11852..9470ff6 100644 --- a/IPython/html/static/notebook/js/actions.js +++ b/IPython/html/static/notebook/js/actions.js @@ -253,8 +253,8 @@ define(['require' env.notebook.delete_cell(); } }, - 'toggle-unsolicited-message-display':{ - help: 'toggle display from external clients', + 'show-other-output':{ + help: 'show/ignore output from other clients', icon: 'fa-sitemap', help_index: 'gb', handler: function (env) { diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js index 06f6c83..3aa465e 100644 --- a/IPython/html/static/notebook/js/keyboardmanager.js +++ b/IPython/html/static/notebook/js/keyboardmanager.js @@ -95,7 +95,7 @@ define([ 'space' : 'ipython.scroll-down', 'down' : 'ipython.select-next-cell', 'i,i' : 'ipython.interrupt-kernel', - 'e': 'ipython.toggle-unsolicited-message-display', + 'e': 'ipython.show-other-output', '0,0' : 'ipython.restart-kernel', 'd,d' : 'ipython.delete-cell', 'esc': 'ipython.close-pager', diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js index 9d028a0..46574b4 100644 --- a/IPython/html/static/notebook/js/notebook.js +++ b/IPython/html/static/notebook/js/notebook.js @@ -137,7 +137,7 @@ define([ this.undelete_below = false; this.paste_enabled = false; this.writable = false; - this.ignore_unsolicited_msgs = false; + this.include_other_output = true; // It is important to start out in command mode to match the intial mode // of the KeyboardManager. this.mode = 'command'; @@ -1579,10 +1579,10 @@ define([ * @method toggle_ignore_unsolicited_msgs */ Notebook.prototype.toggle_ignore_unsolicited_msgs = function () { - this.ignore_unsolicited_msgs = !this.ignore_unsolicited_msgs; - this.events.trigger('toggle_unsolicited_msgs.Notebook', - [this.ignore_unsolicited_msgs]); - return this.ignore_unsolicited_msgs; + this.include_other_output = !this.include_other_output; + this.events.trigger('toggle_other_client_output.Notebook', + [this.include_other_output]); + return this.include_other_output; }; /** @@ -1593,7 +1593,7 @@ define([ * @method handle_unsolicited_msg */ Notebook.prototype.handle_unsolicited_msg = function(msg) { - if (this.ignore_unsolicited_msgs) { + if (!this.include_other_output) { return; } if (msg.msg_type == 'execute_input') { diff --git a/IPython/html/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js index 842a6a5..cd20b55 100644 --- a/IPython/html/static/notebook/js/notificationarea.js +++ b/IPython/html/static/notebook/js/notificationarea.js @@ -279,9 +279,9 @@ define([ nnw.warning(error.message || "Notebook copy failed"); }); - this.events.on('toggle_unsolicited_msgs.Notebook', function(evt, ignored) { - var msg = (ignored? "Ignoring": "Showing") + " I/O from external clients"; nnw.set_message(msg, 1000); + this.events.on('toggle_other_client_output.Notebook', function(evt, ignored) { + var msg = (ignored? "Ignoring": "Showing") + " output from other clients"; }); // Checkpoint events diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html index 2423030..2bbea6e 100644 --- a/IPython/html/templates/notebook.html +++ b/IPython/html/templates/notebook.html @@ -229,8 +229,8 @@ class="notebook_app"