Refactor to move attributes to top level

Fix variable references

Fix formatting

Author: hannahker

src/plots/layout_attributes.js

@@ -189,6 +189,20 @@ module.exports = {
             'Sets the plot\'s height (in px).'
         ].join(' ')
     },
+    minreducedwidth: {
+        valType: 'number',
+        min: 2,
+        dflt: 64,
+        editType: 'plot',
+        description: 'Minimum width of the plot with margin.automargin applied (in px)'
+    },
+    minreducedheight: {
+        valType: 'number',
+        min: 2,
+        dflt: 64,
+        editType: 'plot',
+        description: 'Minimum height of the plot with margin.automargin applied (in px)'
+    },
     margin: {
         l: {
             valType: 'number',
@@ -228,20 +242,6 @@ module.exports = {
                 'between the plotting area and the axis lines'
             ].join(' ')
         },
-        minreducedwidth: {
-            valType: 'number',
-            min: 2,
-            dflt: 64,
-            editType: 'plot',
-            description: 'Minimum width of the plot with automargin applied (in px)'
-        },
-        minreducedheight: {
-            valType: 'number',
-            min: 2,
-            dflt: 64,
-            editType: 'plot',
-            description: 'Minimum height of the plot with automargin applied (in px)'
-        },
         autoexpand: {
             valType: 'boolean',
             dflt: true,

src/plots/plots.js

@@ -1506,14 +1506,15 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
 
     coerce('width');
     coerce('height');
+    coerce('minreducedwidth');
+    coerce('minreducedheight');
+
     coerce('margin.l');
     coerce('margin.r');
     coerce('margin.t');
     coerce('margin.b');
     coerce('margin.pad');
     coerce('margin.autoexpand');
-    coerce('margin.minreducedwidth');
-    coerce('margin.minreducedheight');
 
     if(layoutIn.width && layoutIn.height) plots.sanitizeMargins(layoutOut);
 
@@ -1883,17 +1884,19 @@ plots.autoMargin = function(gd, id, o) {
     var width = fullLayout.width;
     var height = fullLayout.height;
     var margin = fullLayout.margin;
+    var minreducedwidth = fullLayout.minreducedwidth;
+    var minreducedheight = fullLayout.minreducedheight;
 
     var minFinalWidth = Lib.constrain(
         width - margin.l - margin.r,
         MIN_SPECIFIED_WIDTH,
-        margin.minreducedwidth
+        minreducedwidth
     );
 
     var minFinalHeight = Lib.constrain(
         height - margin.t - margin.b,
         MIN_SPECIFIED_HEIGHT,
-        margin.minreducedheight
+        minreducedheight
     );
 
     var maxSpaceW = Math.max(0, width - minFinalWidth);
@@ -1972,6 +1975,8 @@ plots.doAutoMargin = function(gd) {
     var mb = margin.b;
     var pushMargin = fullLayout._pushmargin;
     var pushMarginIds = fullLayout._pushmarginIds;
+    var minreducedwidth = fullLayout.minreducedwidth;
+    var minreducedheight = fullLayout.minreducedheight;
 
     if(fullLayout.margin.autoexpand !== false) {
         for(var k in pushMargin) {
@@ -2030,13 +2035,13 @@ plots.doAutoMargin = function(gd) {
     var minFinalWidth = Lib.constrain(
         width - margin.l - margin.r,
         MIN_SPECIFIED_WIDTH,
-        margin.minreducedwidth
+        minreducedwidth
     );
 
     var minFinalHeight = Lib.constrain(
         height - margin.t - margin.b,
         MIN_SPECIFIED_HEIGHT,
-        margin.minreducedheight
+        minreducedheight
     );
 
     var maxSpaceW = Math.max(0, width - minFinalWidth);

test/image/mocks/z-automargin-minreducedheight.json

@@ -37,12 +37,12 @@
         },
         "width": 240,
         "height": 300,
+        "minreducedheight": 55,
         "margin": {
             "t": 80,
             "b": 20,
             "l": 20,
-            "r": 20,
-            "minreducedheight": 55
+            "r": 20
         },
         "yaxis": {
             "type": "date",

test/image/mocks/z-automargin-minreducedwidth.json

@@ -38,12 +38,12 @@
         },
         "width": 240,
         "height": 200,
+        "minreducedwidth": 55,
         "margin": {
             "t": 80,
             "b": 20,
             "l": 20,
-            "r": 20,
-            "minreducedwidth": 55
+            "r": 20
         },
         "xaxis": {
             "type": "date",

test/jasmine/tests/plots_test.js

@@ -237,9 +237,7 @@ describe('Test Plots', function() {
                 t: 100,
                 b: 80,
                 pad: 0,
-                autoexpand: true,
-                minreducedwidth: 64,
-                minreducedheight: 64
+                autoexpand: true
             };
 
             supplyLayoutDefaults(layoutIn, layoutOut);
@@ -263,9 +261,7 @@ describe('Test Plots', function() {
                 t: 187,
                 b: 311,
                 pad: 0,
-                autoexpand: true,
-                minreducedwidth: 64,
-                minreducedheight: 64
+                autoexpand: true
             };
 
             supplyLayoutDefaults(layoutIn, layoutOut);
@@ -1358,13 +1354,13 @@ describe('Test Plots with automargin and minreducedwidth/height', function() {
             assertClose('height', '55');
         })
         .then(function() {
-            return Plotly.relayout(gd, 'margin.minreducedheight', 100);
+            return Plotly.relayout(gd, 'minreducedheight', 100);
         })
         .then(function() {
             assert('height', '100');
         })
         .then(function() {
-            return Plotly.relayout(gd, 'margin.minreducedwidth', 100);
+            return Plotly.relayout(gd, 'minreducedwidth', 100);
         })
         .then(function() {
             assert('width', '100');

test/plot-schema.json

@@ -3352,20 +3352,6 @@
      "min": 0,
      "valType": "number"
     },
-    "minreducedheight": {
-     "description": "Minimum height of the plot with automargin applied (in px)",
-     "dflt": 64,
-     "editType": "plot",
-     "min": 2,
-     "valType": "number"
-    },
-    "minreducedwidth": {
-     "description": "Minimum width of the plot with automargin applied (in px)",
-     "dflt": 64,
-     "editType": "plot",
-     "min": 2,
-     "valType": "number"
-    },
     "pad": {
      "description": "Sets the amount of padding (in px) between the plotting area and the axis lines",
      "dflt": 0,
@@ -3400,6 +3386,20 @@
     "editType": "none",
     "valType": "string"
    },
+   "minreducedheight": {
+    "description": "Minimum height of the plot with margin.automargin applied (in px)",
+    "dflt": 64,
+    "editType": "plot",
+    "min": 2,
+    "valType": "number"
+   },
+   "minreducedwidth": {
+    "description": "Minimum width of the plot with margin.automargin applied (in px)",
+    "dflt": 64,
+    "editType": "plot",
+    "min": 2,
+    "valType": "number"
+   },
    "modebar": {
     "activecolor": {
      "description": "Sets the color of the active or hovered on icons in the modebar.",