Merge pull request matplotlib#3609 from pelson/nbagg_icons

tacaswell · tacaswell · commit 4896f46f49d1 · 2014-10-02T22:31:16.000-04:00
BUG : Fix Nbagg icons on dev-branch of ipython
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -81,14 +81,17 @@ def connection_info():
     return '\n'.join(result)
 
 
-# Note: Version 3.2 icons, not the later 4.0 ones.
+# Note: Version 3.2 and 4.x icons
 # http://fontawesome.io/3.2.1/icons/
+# http://fontawesome.io/
+# the `fa fa-xxx` part targets font-awesome 4, (IPython 3.x)
+# the icon-xxx targets font awesome 3.21 (IPython 2.x)
 _FONT_AWESOME_CLASSES = {
-    'home': 'icon-home',
-    'back': 'icon-arrow-left',
-    'forward': 'icon-arrow-right',
-    'zoom_to_rect': 'icon-check-empty',
-    'move': 'icon-move',
+    'home': 'fa fa-home icon-home',
+    'back': 'fa fa-arrow-left icon-arrow-left',
+    'forward': 'fa fa-arrow-right icon-arrow-right',
+    'zoom_to_rect': 'fa fa-square-o icon-check-empty',
+    'move': 'fa fa-arrows icon-move',
     None: None
 }
 
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -315,7 +315,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
             "rubberband", x0=x0, y0=y0, x1=x1, y1=y1)
 
     def release_zoom(self, event):
-        super(NavigationToolbar2WebAgg, self).release_zoom(event)
+        backend_bases.NavigationToolbar2.release_zoom(self, event)
         self.canvas.send_event(
             "rubberband", x0=-1, y0=-1, x1=-1, y1=-1)
 
diff --git a/lib/matplotlib/backends/web_backend/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/nbagg_mpl.js
@@ -115,7 +115,7 @@ mpl.figure.prototype._init_toolbar = function() {
 
     // Add the close button to the window.
     var buttongrp = $('<div class="btn-group inline pull-right"></div>');
-    var button = $('<button class="btn btn-mini btn-danger" href="#" title="Close figure"><i class="fa icon-remove icon-large"></i></button>');
+    var button = $('<button class="btn btn-mini btn-danger" href="#" title="Close figure"><i class="fa fa-times icon-remove icon-large"></i></button>');
     button.click(function (evt) { fig.handle_close(fig, {}); } );
     button.mouseover('Close figure', toolbar_mouse_event);
     buttongrp.append(button);
