Remove zoomspeed parameter

rreusser · rreusser · commit e489a7271a0c · 2017-09-27T20:38:20.000-07:00
diff --git a/src/components/fx/layout_attributes.js b/src/components/fx/layout_attributes.js
@@ -31,17 +31,6 @@ module.exports = {
             '3D scenes.'
         ].join(' ')
     },
-    zoomspeed: {
-        valType: 'number',
-        role: 'info',
-        dflt: 1,
-        min: 0,
-        editType: 'none',
-        description: [
-            'Sets the speed at which the mouse wheel zooms the plot. Larger',
-            'values are faster.'
-        ].join(' ')
-    },
     hovermode: {
         valType: 'enumerated',
         role: 'info',
diff --git a/src/components/fx/layout_defaults.js b/src/components/fx/layout_defaults.js
@@ -17,7 +17,6 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
     }
 
     coerce('dragmode');
-    coerce('zoomspeed');
 
     var hovermodeDflt;
     if(layoutOut._has('cartesian')) {
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -380,7 +380,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             return;
         }
 
-        var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100 * fullLayout.zoomspeed),
+        var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100),
             gbb = mainplot.draglayer.select('.nsewdrag')
                 .node().getBoundingClientRect(),
             xfrac = (e.clientX - gbb.left) / gbb.width,
diff --git a/src/plots/gl2d/camera.js b/src/plots/gl2d/camera.js
@@ -262,7 +262,7 @@ function createCamera(scene) {
         var lastX = result.lastPos[0],
             lastY = result.lastPos[1];
 
-        var scale = Math.exp(scene.fullLayout.zoomspeed * 10.0 * dy / (viewBox[3] - viewBox[1]));
+        var scale = Math.exp(10.0 * dy / (viewBox[3] - viewBox[1]));
 
         var cx = lastX /
                 (viewBox[2] - viewBox[0]) * (dataBox[2] - dataBox[0]) +
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -205,7 +205,6 @@ function initializeGLPlot(scene, fullLayout, canvas, gl) {
             center: [cameraData.center.x, cameraData.center.y, cameraData.center.z],
             eye: [cameraData.eye.x, cameraData.eye.y, cameraData.eye.z],
             up: [cameraData.up.x, cameraData.up.y, cameraData.up.z],
-            zoomSpeed: fullLayout.zoomspeed,
             zoomMin: 0.1,
             zoomMax: 100,
             mode: 'orbit'

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`coerce('dragmode');`
`20`		`- coerce('zoomspeed');`
`21`	`20`
`22`	`21`	`var hovermodeDflt;`
`23`	`22`	`if(layoutOut._has('cartesian')) {`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {`
`380`	`380`	`return;`
`381`	`381`	`}`
`382`	`382`
`383`		`- var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100 * fullLayout.zoomspeed),`
	`383`	`+ var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100),`
`384`	`384`	`gbb = mainplot.draglayer.select('.nsewdrag')`
`385`	`385`	`.node().getBoundingClientRect(),`
`386`	`386`	`xfrac = (e.clientX - gbb.left) / gbb.width,`