Zoom: Fix for when fixedRange = true

mdtusz · mdtusz · commit e40c3266aa95 · 2016-05-24T16:06:07.000-04:00
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -601,32 +601,35 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             subplots = Object.keys(plotinfos);
 
         for(var i = 0; i < subplots.length; i++) {
+
             var subplot = plotinfos[subplots[i]],
+                clipId = 'clip' + fullLayout._uid + subplots[i] + 'plot',
                 xa2 = subplot.x(),
                 ya2 = subplot.y(),
                 editX = ew && xa.indexOf(xa2) !== -1 && !xa2.fixedrange,
                 editY = ns && ya.indexOf(ya2) !== -1 && !ya2.fixedrange;
 
-            if(editX || editY) {
 
-                var xScaleFactor = xa2._length / viewBox[2],
-                    yScaleFactor = ya2._length / viewBox[3];
+            var xScaleFactor = editX ? xa2._length / viewBox[2] : 1,
+                yScaleFactor = editY ? ya2._length / viewBox[3] : 1;
 
-                var clipDx = editX ? (viewBox[0] / viewBox[2] * xa2._length) : 0,
-                    clipDy = editY ? (viewBox[1] / viewBox[3] * ya2._length) : 0;
+            var clipDx = editX ? viewBox[0] : 0,
+                clipDy = editY ? viewBox[1] : 0;
 
-                var plotDx = xa2._offset - clipDx,
-                    plotDy = ya2._offset - clipDy;
+            var fracDx = editX ? (viewBox[0] / viewBox[2] * xa2._length) : 0,
+                fracDy = editY ? (viewBox[1] / viewBox[3] * ya2._length) : 0;
 
-                var clipId = 'clip' + fullLayout._uid + subplots[i] + 'plot';
+            var plotDx = xa2._offset - fracDx,
+                plotDy = ya2._offset - fracDy;
 
-                fullLayout._defs.selectAll('#' + clipId)
-                    .call(Lib.setTranslate, viewBox[0], viewBox[1])
-                    .call(Lib.setScale, 1 / xScaleFactor, 1 / yScaleFactor);
-                subplot.plot
-                    .call(Lib.setTranslate, plotDx, plotDy)
-                    .call(Lib.setScale, xScaleFactor, yScaleFactor);
-            }
+
+            fullLayout._defs.selectAll('#' + clipId)
+                .call(Lib.setTranslate, clipDx, clipDy)
+                .call(Lib.setScale, 1 / xScaleFactor, 1 / yScaleFactor);
+
+            subplot.plot
+                .call(Lib.setTranslate, plotDx, plotDy)
+                .call(Lib.setScale, xScaleFactor, yScaleFactor);
         }
     }
 
