fix edge cases from failing tests

Author: KoolADE85

src/plots/geo/zoom.js

@@ -14,7 +14,8 @@ function startDragStyle(geo, el) {
     d3.select(el).style(zoomstartStyle);
 
     var sourceEvent = d3.event.sourceEvent;
-    if(sourceEvent && sourceEvent.type === 'mousedown') {
+    var isRightClick = sourceEvent && (sourceEvent.buttons === 2 || sourceEvent.ctrlKey);
+    if(sourceEvent && sourceEvent.type === 'mousedown' && !isRightClick) {
         geo._dragCover = dragElement.coverSlip();
         geo._dragCover.style.cursor = zoomstartStyle.cursor;
     }

src/traces/parcoords/axisbrush.js

@@ -226,7 +226,7 @@ function dragstart(lThis, d) {
     s.startExtent = interval.region ? unitRange[interval.region === 's' ? 1 : 0] : unitLocation;
     d.parent.inBrushDrag = true;
     s.dragCover = dragElement.coverSlip();
-    s.dragCover.style.cursor = window.getComputedStyle(lThis).cursor;
+    s.dragCover.style.cursor = getCursor(interval);
     s.brushStartCallback();
 }
 
@@ -328,14 +328,15 @@ function dragend(lThis, d) {
     s.brushEndCallback(brush.filterSpecified ? filter.getConsolidated() : []);
 }
 
+function getCursor(interval) {
+    if(interval.clickableOrdinalRange) return 'pointer';
+    if(interval.region) return interval.region + '-resize';
+    return 'crosshair';
+}
+
 function mousemove(lThis, d) {
     var y = d.height - d3.mouse(lThis)[1] - 2 * c.verticalPadding;
-    var interval = getInterval(d, y);
-
-    var cursor = 'crosshair';
-    if(interval.clickableOrdinalRange) cursor = 'pointer';
-    else if(interval.region) cursor = interval.region + '-resize';
-    setCursor(d3.select(lThis), cursor);
+    setCursor(d3.select(lThis), getCursor(getInterval(d, y)));
 }
 
 function attachDragBehavior(selection) {

test/jasmine/tests/fx_test.js

@@ -310,19 +310,19 @@ describe('relayout', function() {
             return Plotly.relayout(gd, 'yaxis.fixedrange', true);
         }).then(function() {
             // still active with fixedrange because we're handling clicks here too.
-            assertMainDrag('pointer', true);
+            assertMainDrag('default', true);
 
             return Plotly.relayout(gd, 'dragmode', 'drag');
         }).then(function() {
-            assertMainDrag('pointer', true);
+            assertMainDrag('default', true);
 
             return Plotly.relayout(gd, 'dragmode', 'lasso');
         }).then(function() {
-            assertMainDrag('pointer', true);
+            assertMainDrag('default', true);
 
             return Plotly.relayout(gd, 'dragmode', 'select');
         }).then(function() {
-            assertMainDrag('pointer', true);
+            assertMainDrag('default', true);
 
             return Plotly.relayout(gd, 'xaxis.fixedrange', false);
         }).then(function() {

test/jasmine/tests/geo_test.js

@@ -1690,6 +1690,26 @@ describe('Test geo interactions', function () {
             .then(done, done.fail);
     });
 
+    it('should not create a drag cover on right-click', function (done) {
+        var gd = createGraphDiv();
+        var fig = Lib.extendDeep({}, require('../../image/mocks/geo_orthographic.json'));
+        fig.layout.width = 700;
+        fig.layout.height = 500;
+        fig.layout.dragmode = 'pan';
+
+        Plotly.newPlot(gd, fig)
+            .then(function () {
+                mouseEvent('mousedown', 350, 250, { buttons: 2 });
+                expect(document.querySelectorAll('.dragcover').length).toBe(0, 'right button');
+                mouseEvent('mouseup', 350, 250, { buttons: 2 });
+
+                mouseEvent('mousedown', 350, 250, { ctrlKey: true });
+                expect(document.querySelectorAll('.dragcover').length).toBe(0, 'ctrl key');
+                mouseEvent('mouseup', 350, 250, { ctrlKey: true });
+            })
+            .then(done, done.fail);
+    });
+
     it('should clear hover label when cursor slips off subplot', function (done) {
         var gd = createGraphDiv();
         var fig = Lib.extendDeep({}, require('../../image/mocks/geo_orthographic.json'));