bring handleTypeDefaults api on-par

... with other sub-supply-defaults routines

Author: etpinard

src/plots/cartesian/layout_defaults.js

@@ -157,7 +157,9 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         axLayoutOut._annIndices = [];
         axLayoutOut._shapeIndices = [];
 
-        handleTypeDefaults(axLayoutIn, axLayoutOut, coerce, traces, axName);
+        // set up some private properties
+        axLayoutOut._name = axName;
+        var id = axLayoutOut._id = name2id(axName);
 
         var overlayableAxes = getOverlayableAxes(axLetter, axName);
 
@@ -173,6 +175,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
             cheateronly: axLetter === 'x' && xaCheater[axName] && !xaNonCheater[axName]
         };
 
+        handleTypeDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions);
         handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);
 
         var spikecolor = coerce2('spikecolor'),

src/plots/cartesian/type_defaults.js

@@ -11,27 +11,20 @@
 
 var Registry = require('../../registry');
 var autoType = require('./axis_autotype');
-var name2id = require('./axis_ids').name2id;
 
 /*
  *  data: the plot data to use in choosing auto type
  *  name: axis object name (ie 'xaxis') if one should be stored
  */
-module.exports = function handleTypeDefaults(containerIn, containerOut, coerce, data, name) {
-    // set up some private properties
-    if(name) {
-        containerOut._name = name;
-        containerOut._id = name2id(name);
-    }
+module.exports = function handleTypeDefaults(containerIn, containerOut, coerce, options) {
 
     var axType = coerce('type');
     if(axType === '-') {
-        setAutoType(containerOut, data);
+        setAutoType(containerOut, options.data);
 
         if(containerOut.type === '-') {
             containerOut.type = 'linear';
-        }
-        else {
+        } else {
             // copy autoType back to input axis
             // note that if this object didn't exist
             // in the input layout, we have to put it in

src/plots/gl3d/layout/axis_defaults.js

@@ -39,7 +39,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
         containerOut._id = axName[0] + options.scene;
         containerOut._name = axName;
 
-        handleTypeDefaults(containerIn, containerOut, coerce, options.data);
+        handleTypeDefaults(containerIn, containerOut, coerce, options);
 
         handleAxisDefaults(
             containerIn,