use containerOut._template for axis template

Author: archmoj

src/plots/cartesian/axis_defaults.js

@@ -51,7 +51,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
 
     var visible = coerce('visible', !options.visibleDflt);
 
-    var axType = containerOut.type || options.axTemplate.type || '-';
+    var axTemplate = containerOut._template || {};
+    var axType = containerOut.type || axTemplate.type || '-';
 
     if(axType === 'date') {
         var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleDefaults');
@@ -125,8 +126,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
     }
 
     if(axType === 'date') {
-        var fromTemplate = (options.axTemplate || {}).rangebreaks;
-        var rangebreaks = containerIn.rangebreaks || fromTemplate;
+        var rangebreaks = containerIn.rangebreaks || axTemplate.rangebreaks;
 
         if(Array.isArray(rangebreaks) && rangebreaks.length) {
             handleArrayContainerDefaults(containerIn, containerOut, {

src/plots/cartesian/layout_defaults.js

@@ -230,13 +230,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
                 axHasImage[axName]
               ));
 
-        var axTemplate;
-        if(Lib.isPlainObject(layoutOut._template)) {
-            axTemplate = layoutOut._template[axLayoutOut._name];
-        }
-
         var defaultOptions = {
-            axTemplate: axTemplate || {},
             letter: axLetter,
             font: layoutOut.font,
             outerTicks: outerTicks[axName],
@@ -301,13 +295,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         axLayoutOut = Template.newContainer(layoutOut, axName, axLetter + 'axis');
         newAxLayoutOut();
 
-        var axTemplate2;
-        if(Lib.isPlainObject(layoutOut._template)) {
-            axTemplate2 = layoutOut._template[axLayoutOut._name];
-        }
-
         var defaultOptions2 = {
-            axTemplate: axTemplate2 || {},
             letter: axLetter,
             font: layoutOut.font,
             outerTicks: outerTicks[axName],

src/plots/cartesian/tick_label_defaults.js

@@ -59,8 +59,9 @@ function handleOtherDefaults(containerIn, containerOut, coerce, axType, options)
 
         if(axType !== 'category') {
             var tickFormat = coerce('tickformat');
-            var fromTemplate = (options.axTemplate || {}).tickformatstops;
-            var tickformatStops = containerIn.tickformatstops || fromTemplate;
+
+            var axTemplate = containerOut._template || {};
+            var tickformatStops = containerIn.tickformatstops || axTemplate.tickformatstops;
 
             if(Array.isArray(tickformatStops) && tickformatStops.length) {
                 handleArrayContainerDefaults(containerIn, containerOut, {