Fix review comments

Author: dy

src/plots/cartesian/dragbox.js

@@ -171,31 +171,13 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             else if(isSelectOrLasso(dragModeNow)) {
                 dragOptions.xaxes = xa;
                 dragOptions.yaxes = ya;
-
-                // take over selection polygons from prev mode, if any
-                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)) {
-                    plotinfo.selection = {};
-                    plotinfo.selection.polygons = dragOptions.polygons = [];
-                    plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
-                }
-
                 prepSelect(e, startX, startY, dragOptions, dragModeNow);
             }
         }
     };
 
     dragElement.init(dragOptions);
 
-    // FIXME: this hack highlights selection once we enter select/lasso mode
-    if(isSelectOrLasso(gd._fullLayout.dragmode) && plotinfo.selection) {
-        showSelect(zoomlayer, dragOptions);
-    }
-
     var x0,
         y0,
         box,
@@ -548,8 +530,6 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 
         updateSubplots([x0, y0, pw - dx, ph - dy]);
 
-        if(plotinfo.ondrag) plotinfo.ondrag.call([x0, y0, pw - dx, ph - dy]);
-
         ticksAndAnnotations(yActive, xActive);
     }
 
@@ -926,31 +906,6 @@ function clearSelect(zoomlayer) {
     zoomlayer.selectAll('.select-outline').remove();
 }
 
-function showSelect(zoomlayer, dragOptions) {
-    var outlines = zoomlayer.selectAll('path.select-outline').data([1, 2]),
-        plotinfo = dragOptions.plotinfo,
-        xaxis = plotinfo.xaxis,
-        yaxis = plotinfo.yaxis,
-        selection = plotinfo.selection,
-        polygons = selection.mergedPolygons,
-        xs = xaxis._offset,
-        ys = yaxis._offset,
-        paths = [];
-
-    for(var i = 0; i < polygons.length; i++) {
-        var ppts = polygons[i];
-        paths.push(ppts.join('L') + 'L' + ppts[0]);
-    }
-
-    if(paths.length) {
-        outlines.enter()
-            .append('path')
-            .attr('class', function(d) { return 'select-outline select-outline-' + d; })
-            .attr('transform', 'translate(' + xs + ', ' + ys + ')')
-            .attr('d', 'M' + paths.join('M') + 'Z');
-    }
-}
-
 function updateZoombox(zb, corners, box, path0, dimmed, lum) {
     zb.attr('d',
         path0 + 'M' + (box.l) + ',' + (box.t) + 'v' + (box.h) +

src/plots/cartesian/select.js

@@ -44,6 +44,19 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
         filterPoly, testPoly, mergedPolygons, currentPolygon,
         subtract = e.altKey;
 
+
+    // take over selection polygons from prev mode, if any
+    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)) {
+        plotinfo.selection = {};
+        plotinfo.selection.polygons = dragOptions.polygons = [];
+        plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
+    }
+
     if(mode === 'lasso') {
         filterPoly = filteredPolygon([[x0, y0]], constants.BENDPX);
     }