create constraints.clean to get it out of the main Plotly.plot code

Author: alexcjohnson

src/plot_api/plot_api.js

@@ -32,7 +32,9 @@ var manageArrays = require('./manage_arrays');
 var helpers = require('./helpers');
 var subroutines = require('./subroutines');
 var cartesianConstants = require('../plots/cartesian/constants');
-var enforceAxisConstraints = require('../plots/cartesian/constraints');
+var axisConstraints = require('../plots/cartesian/constraints');
+var enforceAxisConstraints = axisConstraints.enforce;
+var cleanAxisConstraints = axisConstraints.clean;
 var axisIds = require('../plots/cartesian/axis_ids');
 
 
@@ -269,24 +271,8 @@ Plotly.plot = function(gd, data, layout, config) {
 
         var axList = Plotly.Axes.list(gd, '', true);
         for(var i = 0; i < axList.length; i++) {
-            // before autoranging, check if this axis was previously constrained
-            // by domain but no longer is
             var ax = axList[i];
-            if(ax._inputDomain) {
-                var isConstrained = false;
-                var axId = ax._id;
-                var constraintGroups = gd._fullLayout._axisConstraintGroups;
-                for(var j = 0; j < constraintGroups.length; j++) {
-                    if(constraintGroups[j][axId]) {
-                        isConstrained = true;
-                        break;
-                    }
-                }
-                if(!isConstrained || ax.constrain !== 'domain') {
-                    ax._input.domain = ax.domain = ax._inputDomain;
-                    delete ax._inputDomain;
-                }
-            }
+            cleanAxisConstraints(gd, ax);
 
             Plotly.Axes.doAutoRange(ax);
         }
@@ -2000,7 +1986,6 @@ function _relayout(gd, aobj) {
             }
         }
         else if(pleafPlus.match(/^[xyz]axis[0-9]*\.domain(\[[0|1]\])?$/)) {
-            axId = recordAlteredAxis(pleafPlus);
             Lib.nestedProperty(fullLayout, ptrunk + '._inputDomain').set(null);
         }
         else if(pleafPlus.match(/^[xyz]axis[0-9]*\.constrain.*$/)) {

src/plots/cartesian/constraints.js

@@ -17,7 +17,7 @@ var ALMOST_EQUAL = require('../../constants/numerical').ALMOST_EQUAL;
 var FROM_BL = require('../../constants/alignment').FROM_BL;
 
 
-module.exports = function enforceAxisConstraints(gd) {
+exports.enforce = function enforceAxisConstraints(gd) {
     var fullLayout = gd._fullLayout;
     var constraintGroups = fullLayout._axisConstraintGroups;
 
@@ -172,6 +172,26 @@ module.exports = function enforceAxisConstraints(gd) {
     }
 };
 
+// For use before autoranging, check if this axis was previously constrained
+// by domain but no longer is
+exports.clean = function cleanConstraints(gd, ax) {
+    if(ax._inputDomain) {
+        var isConstrained = false;
+        var axId = ax._id;
+        var constraintGroups = gd._fullLayout._axisConstraintGroups;
+        for(var j = 0; j < constraintGroups.length; j++) {
+            if(constraintGroups[j][axId]) {
+                isConstrained = true;
+                break;
+            }
+        }
+        if(!isConstrained || ax.constrain !== 'domain') {
+            ax._input.domain = ax.domain = ax._inputDomain;
+            delete ax._inputDomain;
+        }
+    }
+};
+
 function updateDomain(ax, factor) {
     var inputDomain = ax._inputDomain;
     var centerFraction = FROM_BL[ax.constraintoward];

src/plots/gl2d/scene2d.js

@@ -22,7 +22,9 @@ var createOptions = require('./convert');
 var createCamera = require('./camera');
 var convertHTMLToUnicode = require('../../lib/html2unicode');
 var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');
-var enforceAxisConstraints = require('../../plots/cartesian/constraints');
+var axisConstraints = require('../../plots/cartesian/constraints');
+var enforceAxisConstraints = axisConstraints.enforce;
+var cleanAxisConstraints = axisConstraints.clean;
 
 var AXES = ['xaxis', 'yaxis'];
 var STATIC_CANVAS, STATIC_CONTEXT;
@@ -395,6 +397,15 @@ proto.plot = function(fullData, calcData, fullLayout) {
     options.merge(fullLayout);
     options.screenBox = [0, 0, width, height];
 
+    var mockGraphDiv = {_fullLayout: {
+        _axisConstraintGroups: this.graphDiv._fullLayout._axisConstraintGroups,
+        xaxis: this.xaxis,
+        yaxis: this.yaxis
+    }};
+
+    cleanAxisConstraints(mockGraphDiv, this.xaxis);
+    cleanAxisConstraints(mockGraphDiv, this.yaxis);
+
     var size = fullLayout._size,
         domainX = this.xaxis.domain,
         domainY = this.yaxis.domain;
@@ -441,12 +452,7 @@ proto.plot = function(fullData, calcData, fullLayout) {
         ax.setScale();
     }
 
-    var mockLayout = {
-        _axisConstraintGroups: this.graphDiv._fullLayout._axisConstraintGroups,
-        xaxis: this.xaxis,
-        yaxis: this.yaxis
-    };
-    enforceAxisConstraints({_fullLayout: mockLayout});
+    enforceAxisConstraints(mockGraphDiv);
 
     options.ticks = this.computeTickMarks();