Fixed firefox keyboard focus bug with nbagg backend.

pelson · pelson · commit 3e4620ac3d40 · 2014-09-22T10:49:01.000+01:00
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -39,7 +39,7 @@
 from matplotlib.figure import Figure
 from matplotlib._pylab_helpers import Gcf
 from . import backend_webagg_core as core
-from . import backend_nbagg
+from .backend_nbagg import TimerTornado
 
 
 def new_figure_manager(num, *args, **kwargs):
@@ -103,7 +103,7 @@ def show(self):
         show()
 
     def new_timer(self, *args, **kwargs):
-        return backend_nbagg.TimerTornado(*args, **kwargs)
+        return TimerTornado(*args, **kwargs)
 
     def start_event_loop(self, timeout):
         backend_bases.FigureCanvasBase.start_event_loop_default(
diff --git a/lib/matplotlib/backends/web_backend/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/nbagg_mpl.js
@@ -55,6 +55,9 @@ mpl.figure.prototype.handle_close = function(fig, msg) {
     // Update the output cell to use the data from the current canvas.
     fig.push_to_output();
     var dataURL = fig.canvas.toDataURL();
+    // Re-enable the keyboard manager in IPython - without this line, in FF,
+    // the notebook keyboard shortcuts fail.
+    IPython.keyboard_manager.enable()
     $(fig.parent_element).html('<img src="' + dataURL + '">');
     fig.send_message('closing', {});
     fig.ws.close()
