Revert "set various layout components via template"

This reverts commit 96e3590.

Author: archmoj

src/components/annotations/defaults.js

@@ -19,7 +19,6 @@ var attributes = require('./attributes');
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     handleArrayContainerDefaults(layoutIn, layoutOut, {
-        fromTemplate: (layoutOut._template || {}).annotations,
         name: 'annotations',
         handleItemDefaults: handleAnnotationDefaults
     });

src/components/annotations3d/defaults.js

@@ -16,7 +16,6 @@ var attributes = require('./attributes');
 
 module.exports = function handleDefaults(sceneLayoutIn, sceneLayoutOut, opts) {
     handleArrayContainerDefaults(sceneLayoutIn, sceneLayoutOut, {
-        fromTemplate: (sceneLayoutOut._template || {}).annotations,
         name: 'annotations',
         handleItemDefaults: handleAnnotationDefaults,
         fullLayout: opts.fullLayout

src/components/grid/index.js

@@ -177,12 +177,11 @@ function getAxes(layout, grid, axLetter) {
 // the shape of the grid - this needs to be done BEFORE supplyDataDefaults
 // so that non-subplot traces can place themselves in the grid
 function sizeDefaults(layoutIn, layoutOut) {
-    var gridIn = layoutIn.grid || ((layoutIn.template || {}).layout || {}).grid;
-    var xAxes = getAxes(layoutOut, gridIn || {}, 'x');
-    var yAxes = getAxes(layoutOut, gridIn || {}, 'y');
+    var gridIn = layoutIn.grid || {};
+    var xAxes = getAxes(layoutOut, gridIn, 'x');
+    var yAxes = getAxes(layoutOut, gridIn, 'y');
 
-    if(!gridIn && !xAxes && !yAxes) return;
-    if(!gridIn) gridIn = {};
+    if(!layoutIn.grid && !xAxes && !yAxes) return;
 
     var hasSubplotGrid = Array.isArray(gridIn.subplots) && Array.isArray(gridIn.subplots[0]);
     var hasXaxes = Array.isArray(xAxes);

src/components/images/defaults.js

@@ -17,7 +17,6 @@ var name = 'images';
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     var opts = {
-        fromTemplate: (layoutOut._template || {}).images,
         name: name,
         handleItemDefaults: imageDefaults
     };

src/components/rangeselector/defaults.js

@@ -26,7 +26,6 @@ module.exports = function handleDefaults(containerIn, containerOut, layout, coun
     }
 
     var buttons = handleArrayContainerDefaults(selectorIn, selectorOut, {
-        fromTemplate: (selectorOut._template || {}).buttons,
         name: 'buttons',
         handleItemDefaults: buttonDefaults,
         calendar: calendar

src/components/shapes/defaults.js

@@ -19,7 +19,6 @@ var helpers = require('./helpers');
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     handleArrayContainerDefaults(layoutIn, layoutOut, {
-        fromTemplate: (layoutOut._template || {}).shapes,
         name: 'shapes',
         handleItemDefaults: handleShapeDefaults
     });

src/components/sliders/defaults.js

@@ -20,7 +20,6 @@ var stepAttrs = attributes.steps;
 
 module.exports = function slidersDefaults(layoutIn, layoutOut) {
     handleArrayContainerDefaults(layoutIn, layoutOut, {
-        fromTemplate: (layoutOut._template || {}).sliders,
         name: name,
         handleItemDefaults: sliderDefaults
     });
@@ -32,7 +31,6 @@ function sliderDefaults(sliderIn, sliderOut, layoutOut) {
     }
 
     var steps = handleArrayContainerDefaults(sliderIn, sliderOut, {
-        fromTemplate: (layoutOut._template || {}).steps,
         name: 'steps',
         handleItemDefaults: stepDefaults
     });

src/components/updatemenus/defaults.js

@@ -20,7 +20,6 @@ var buttonAttrs = attributes.buttons;
 
 module.exports = function updateMenusDefaults(layoutIn, layoutOut) {
     var opts = {
-        fromTemplate: (layoutOut._template || {}).updatemenus,
         name: name,
         handleItemDefaults: menuDefaults
     };
@@ -34,7 +33,6 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
     }
 
     var buttons = handleArrayContainerDefaults(menuIn, menuOut, {
-        fromTemplate: (layoutOut._template || {}).buttons,
         name: 'buttons',
         handleItemDefaults: buttonDefaults
     });

src/plots/mapbox/layout_defaults.js

@@ -35,7 +35,6 @@ function handleDefaults(containerIn, containerOut, coerce, opts) {
     coerce('pitch');
 
     handleArrayContainerDefaults(containerIn, containerOut, {
-        fromTemplate: (containerOut._template || {}).layers,
         name: 'layers',
         handleItemDefaults: handleLayerDefaults
     });