Fix nbagg

mdboom · mdboom · commit 68cdfa9766fa · 2015-11-17T14:39:49.000-05:00
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -50,7 +50,7 @@ mpl.figure = function(figure_id, websocket, ondownload, parent_element) {
     $(parent_element).append(this.root);
 
     this._init_header(this);
-    ratio = this._init_canvas(this);
+    this._init_canvas(this);
     this._init_toolbar(this);
 
     var fig = this;
@@ -60,7 +60,7 @@ mpl.figure = function(figure_id, websocket, ondownload, parent_element) {
     this.ws.onopen =  function () {
             fig.send_message("supports_binary", {value: fig.supports_binary});
             fig.send_message("send_image_mode", {});
-            fig.send_message("set_dpi_ratio", {'dpi_ratio': ratio});
+            fig.send_message("set_dpi_ratio", {'dpi_ratio': fig.ratio});
             fig.send_message("refresh", {});
         }
 
@@ -130,6 +130,15 @@ mpl.figure.prototype._init_canvas = function() {
     this.canvas = canvas[0];
     this.context = canvas[0].getContext("2d");
 
+    var backingStore = this.context.backingStorePixelRatio ||
+	this.context.webkitBackingStorePixelRatio ||
+	this.context.mozBackingStorePixelRatio ||
+	this.context.msBackingStorePixelRatio ||
+	this.context.oBackingStorePixelRatio ||
+	this.context.backingStorePixelRatio || 1;
+
+    this.ratio = (window.devicePixelRatio || 1) / backingStore;
+
     var rubberband = $('<canvas/>');
     rubberband.attr('style', "position: absolute; left: 0; top: 0; z-index: 1;")
 
@@ -186,8 +195,8 @@ mpl.figure.prototype._init_canvas = function() {
         canvas_div.css('width', width)
         canvas_div.css('height', height)
 
-        canvas.attr('width', width * ratio);
-        canvas.attr('height', height * ratio);
+        canvas.attr('width', width * this.ratio);
+        canvas.attr('height', height * this.ratio);
         canvas.attr('style', 'width: ' + width + 'px; height: ' + height + 'px;');
 
         rubberband.attr('width', width);
@@ -209,17 +218,6 @@ mpl.figure.prototype._init_canvas = function() {
     }
 
     window.setTimeout(set_focus, 100);
-
-    var backingStore = this.context.backingStorePixelRatio ||
-	this.context.webkitBackingStorePixelRatio ||
-	this.context.mozBackingStorePixelRatio ||
-	this.context.msBackingStorePixelRatio ||
-	this.context.oBackingStorePixelRatio ||
-	this.context.backingStorePixelRatio || 1;
-
-    var ratio = (window.devicePixelRatio || 1) / backingStore;
-
-    return ratio
 }
 
 mpl.figure.prototype._init_toolbar = function() {
