stash layer clipId value (null or same as clipId)

- to DRY up Drawing.setClipUrl calls downstream, where `if(plotinfo._hasClipOnAxisFalse)` statements are removed.
plotly · Jul 11, 2017 · 0496144 · 0496144
1 parent 62ab845
commit 0496144
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/components/errorbars/plot.js b/src/components/errorbars/plot.js
@@ -61,10 +61,7 @@ module.exports = function plot(traces, plotinfo, transitionOpts) {
                 .style('opacity', 1);
         }
 
-        errorbars.call(
-            Drawing.setClipUrl,
-            plotinfo._hasClipOnAxisFalse ? plotinfo.clipId : null
-        );
+        Drawing.setClipUrl(errorbars, plotinfo.layerClipId);
 
         errorbars.each(function(d) {
             var errorbar = d3.select(this);

diff --git a/src/plot_api/subroutines.js b/src/plot_api/subroutines.js
@@ -178,7 +178,7 @@ exports.lsInner = function(gd) {
             layerClipId = null;
         }
 
-        plotinfo.plot.call(Drawing.setClipUrl, plotClipId);
+        Drawing.setClipUrl(plotinfo.plot, plotClipId);
 
         for(i = 0; i < cartesianConstants.layers.length; i++) {
             var layer = cartesianConstants.layers[i];
@@ -187,6 +187,10 @@ exports.lsInner = function(gd) {
             }
         }
 
+        // stash layer clipId value (null or same as clipId)
+        // to DRY up Drawing.setClipUrl calls downstream
+        plotinfo.layerClipId = layerClipId;
+
         var xlw = Drawing.crispRound(gd, xa.linewidth, 1),
             ylw = Drawing.crispRound(gd, ya.linewidth, 1),
             xp = gs.p + ylw,

diff --git a/src/traces/scatter/plot.js b/src/traces/scatter/plot.js
@@ -139,9 +139,7 @@ function createFills(gd, scatterlayer, plotinfo) {
             trace._ownFill = null;
         }
 
-        if(plotinfo._hasClipOnAxisFalse) {
-            tr.selectAll('.js-fill').call(Drawing.setClipUrl, plotinfo.clipId);
-        }
+        tr.selectAll('.js-fill').call(Drawing.setClipUrl, plotinfo.layerClipId);
     });
 }
 
@@ -328,9 +326,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         .call(Drawing.lineGroupStyle)
         .each(makeUpdate(true));
 
-    if(plotinfo._hasClipOnAxisFalse) {
-        Drawing.setClipUrl(lineJoin, plotinfo.clipId);
-    }
+    Drawing.setClipUrl(lineJoin, plotinfo.layerClipId);
 
     if(segments.length) {
         if(ownFillEl3) {

diff --git a/src/traces/scatterternary/plot.js b/src/traces/scatterternary/plot.js
@@ -23,8 +23,7 @@ module.exports = function plot(ternary, moduleCalcData) {
         xaxis: ternary.xaxis,
         yaxis: ternary.yaxis,
         plot: plotContainer,
-        clipId: ternary.clipIdRelative,
-        _hasClipOnAxisFalse: ternary._hasClipOnAxisFalse
+        layerClipId: ternary._hasClipOnAxisFalse ? ternary.clipIdRelative : null
     };
 
     // add ref to ternary subplot object in fullData traces