fix select on ternaryscatter

alexcjohnson · alexcjohnson · commit c47d4f950874 · 2016-04-02T00:13:59.000+02:00
diff --git a/src/plots/cartesian/select.js b/src/plots/cartesian/select.js
@@ -71,15 +71,27 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
         trace = cd[0].trace;
         if(!trace._module || !trace._module.selectPoints) continue;
 
-        if(xAxisIds.indexOf(trace.xaxis) === -1) continue;
-        if(yAxisIds.indexOf(trace.yaxis) === -1) continue;
-
-        searchTraces.push({
-            selectPoints: trace._module.selectPoints,
-            cd: cd,
-            xaxis: axes.getFromId(gd, trace.xaxis),
-            yaxis: axes.getFromId(gd, trace.yaxis)
-        });
+        if(dragOptions.subplot) {
+            if(trace.subplot !== dragOptions.subplot) continue;
+
+            searchTraces.push({
+                selectPoints: trace._module.selectPoints,
+                cd: cd,
+                xaxis: dragOptions.xaxes[0],
+                yaxis: dragOptions.yaxes[0]
+            });
+        }
+        else {
+            if(xAxisIds.indexOf(trace.xaxis) === -1) continue;
+            if(yAxisIds.indexOf(trace.yaxis) === -1) continue;
+
+            searchTraces.push({
+                selectPoints: trace._module.selectPoints,
+                cd: cd,
+                xaxis: axes.getFromId(gd, trace.xaxis),
+                yaxis: axes.getFromId(gd, trace.yaxis)
+            });
+        }
     }
 
     function axValue(ax) {
diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js
@@ -371,17 +371,20 @@ proto.init_interactions = function() {
     var _this = this,
         dragger = _this.layers.plotbg.select('path').node(),
         gd = _this.graphDiv,
-        plot = _this.layers.frontplot;
+        zoomContainer = _this.layers.zoom;
 
     // use plotbg for the main interactions
     var dragOptions = {
         element: dragger,
         gd: gd,
-        plotinfo: {plot: plot},
-        xaxes: _this.xaxis,
-        yaxes: _this.yaxis,
+        plotinfo: {plot: zoomContainer},
         doubleclick: doubleClick,
+        subplot: _this.id,
         prepFn: function(e, startX, startY) {
+            // these aren't available yet when init_interactions
+            // is called
+            dragOptions.xaxes = [_this.xaxis];
+            dragOptions.yaxes = [_this.yaxis];
             var dragModeNow = gd._fullLayout.dragmode;
             if(e.shiftKey) {
                 if(dragModeNow === 'pan') dragModeNow = 'zoom';
@@ -425,15 +428,15 @@ proto.init_interactions = function() {
         path0 = 'M0,' + _this.h + 'L' + (_this.w / 2) +', 0L' + _this.w + ',' + _this.h + 'Z';
         dimmed = false;
 
-        zb = _this.layers.zoom.append('path')
+        zb = zoomContainer.append('path')
             .attr('class', 'zoombox')
             .style({
                 'fill': lum>0.2 ? 'rgba(0,0,0,0)' : 'rgba(255,255,255,0)',
                 'stroke-width': 0
             })
             .attr('d', path0);
 
-        corners = _this.layers.zoom.append('path')
+        corners = zoomContainer.append('path')
             .attr('class', 'zoombox-corners')
             .style({
                 fill: Plotly.Color.background,
