rename axis utils module --> axis_ids

Author: etpinard

src/plots/cartesian/axes.js

@@ -20,13 +20,13 @@ axes.supplyLayoutDefaults = require('./layout_defaults');
 
 axes.setConvert = require('./set_convert');
 
-var utils = require('./utils');
-axes.id2name = utils.id2name;
-axes.cleanId = utils.cleanId;
-axes.list = utils.list;
-axes.listIds = utils.listIds;
-axes.getFromId = utils.getFromId;
-axes.getFromTrace = utils.getFromTrace;
+var axisIds = require('./axisIds');
+axes.id2name = axisIds.id2name;
+axes.cleanId = axisIds.cleanId;
+axes.list = axisIds.list;
+axes.listIds = axisIds.listIds;
+axes.getFromId = axisIds.getFromId;
+axes.getFromTrace = axisIds.getFromTrace;
 
 
 // find the list of possible axes to reference with an xref or yref attribute

src/plots/cartesian/axis_defaults.js

@@ -19,7 +19,7 @@ var handleTickValueDefaults = require('./tick_value_defaults');
 var handleTickDefaults = require('./tick_defaults');
 var setConvert = require('./set_convert');
 var cleanDatum = require('./clean_datum');
-var utils = require('./utils');
+var axisIds = require('./axis_ids');
 
 
 /**
@@ -44,7 +44,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
     // set up some private properties
     if(options.name) {
         containerOut._name = options.name;
-        containerOut._id = utils.name2id(options.name);
+        containerOut._id = axisIds.name2id(options.name);
     }
 
     // now figure out type and do some more initialization

src/plots/cartesian/utils.js renamed to src/plots/cartesian/axis_ids.js

@@ -16,7 +16,7 @@ var constants = require('./constants');
 var layoutAttributes = require('./layout_attributes');
 var handleAxisDefaults = require('./axis_defaults');
 var handlePositionDefaults = require('./position_defaults');
-var utils = require('./utils');
+var axisIds = require('./axis_ids');
 
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
@@ -36,8 +36,8 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
     for(i = 0; i < fullData.length; i++) {
         var trace = fullData[i],
-            xaName = utils.id2name(trace.xaxis),
-            yaName = utils.id2name(trace.yaxis);
+            xaName = axisIds.id2name(trace.xaxis),
+            yaName = axisIds.id2name(trace.yaxis);
 
         // add axes implied by traces
         if(xaName && xaList.indexOf(xaName) === -1) xaList.push(xaName);
@@ -84,10 +84,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
             },
             positioningOptions = {
                 letter: axLetter,
-                counterAxes: {x: yaList, y: xaList}[axLetter].map(utils.name2id),
+                counterAxes: {x: yaList, y: xaList}[axLetter].map(axisIds.name2id),
                 overlayableAxes: {x: xaList, y: yaList}[axLetter].filter(function(axName2){
                     return axName2!==axName && !(layoutIn[axName2]||{}).overlaying;
-                }).map(utils.name2id)
+                }).map(axisIds.name2id)
             };
 
         function coerce(attr, dflt) {

src/plots/cartesian/layout_defaults.js

@@ -16,7 +16,7 @@ var Lib = require('../../lib');
 
 var constants = require('./constants');
 var cleanDatum = require('./clean_datum');
-var utils = require('./utils');
+var axisIds = require('./axis_ids');
 
 
 /**
@@ -74,7 +74,7 @@ module.exports = function setConvert(ax) {
         // make sure we have a domain (pull it in from the axis
         // this one is overlaying if necessary)
         if(ax.overlaying) {
-            var ax2 = utils.getFromId(ax._td, ax.overlaying);
+            var ax2 = axisIds.getFromId(ax._td, ax.overlaying);
             ax.domain = ax2.domain;
         }