Fix initial-shift selection

dy · dy · commit ca4aaae2ed1e · 2017-11-03T14:07:10.000-04:00
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -173,12 +173,12 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
                 dragOptions.yaxes = ya;
 
                 // take over selection polygons from prev mode, if any
-                if((e.shiftKey || e.altKey) && plotinfo.selection.polygons && !dragOptions.polygons) {
+                if((e.shiftKey || e.altKey) && (plotinfo.selection && plotinfo.selection.polygons) && !dragOptions.polygons) {
                     dragOptions.polygons = plotinfo.selection.polygons;
                     dragOptions.mergedPolygons = plotinfo.selection.mergedPolygons;
                 }
                 // create new polygons, if shift mode
-                else if((!e.shiftKey && !e.altKey) || ((e.shiftKey || e.altKey) && !plotinfo.selection.polygons)) {
+                else if((!e.shiftKey && !e.altKey) || ((e.shiftKey || e.altKey) && !plotinfo.selection)) {
                     plotinfo.selection = {};
                     plotinfo.selection.polygons = dragOptions.polygons = [];
                     plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
