Merge pull request ipython#5014 from jdfreder/widget-popup-keys

Fix command mode & popup view bug
mattvonrocketstein · Feb 4, 2014 · 84221b4 · 84221b4
2 parents 5ed8edb + 9da263d
commit 84221b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/IPython/html/static/notebook/js/widgetmanager.js b/IPython/html/static/notebook/js/widgetmanager.js
@@ -93,8 +93,14 @@
         WidgetManager.prototype._handle_display_view = function (view) {
             // Have the IPython keyboard manager disable its event
             // handling so the widget can capture keyboard input.
-            // Note, this is only done on the outer most widget.
+            // Note, this is only done on the outer most widgets.
             IPython.keyboard_manager.register_events(view.$el);
+
+            if (view.additional_elements) {
+                for (var i = 0; i < view.additional_elements.length; i++) {
+                    IPython.keyboard_manager.register_events(view.additional_elements[i]);
+                }
+            } 
         };
 
         WidgetManager.prototype.create_view = function(model, options, view) {

diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js
@@ -75,6 +75,14 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) {
                 .mousedown(function(){
                     that.bring_to_front();
                 });
+
+            // Set the elements array since the this.$window element is not child
+            // of this.$el and the parent widget manager or other widgets may
+            // need to know about all of the top-level widgets.  The IPython
+            // widget manager uses this to register the elements with the
+            // keyboard manager.
+            this.additional_elements = [this.$window]
+
             this.$title_bar = $('<div />')
                 .addClass('popover-title')
                 .appendTo(this.$window)