frameMargins evaluated with respect to div's size

Author: antoinerg

src/plots/plots.js

@@ -1365,11 +1365,6 @@ plots.plotAutoSize = function plotAutoSize(gd, layout, fullLayout) {
         // just hide it
         document.body.style.overflow = 'hidden';
     }
-    else if(isNumeric(frameMargins) && frameMargins > 0) {
-        var factor = 1 - 2 * frameMargins;
-        newWidth = Math.round(factor * fullLayout.width);
-        newHeight = Math.round(factor * fullLayout.height);
-    }
     else {
         // plotly.js - let the developers do what they want, either
         // provide height and width for the container div,
@@ -1379,6 +1374,12 @@ plots.plotAutoSize = function plotAutoSize(gd, layout, fullLayout) {
 
         newWidth = parseFloat(computedStyle.width) || parseFloat(computedStyle.maxWidth) || fullLayout.width;
         newHeight = parseFloat(computedStyle.height) || parseFloat(computedStyle.maxHeight) || fullLayout.height;
+
+        if(isNumeric(frameMargins) && frameMargins > 0) {
+            var factor = 1 - 2 * frameMargins;
+            newWidth = Math.round(factor * newWidth);
+            newHeight = Math.round(factor * newHeight);
+        }
     }
 
     var minWidth = plots.layoutAttributes.width.min,

test/jasmine/tests/config_test.js

@@ -145,7 +145,7 @@ describe('config argument', function() {
                 fillFrame: false,
                 frameMargins: 0.1
             };
-            var layoutHeight = 360;
+            var layoutHeight = Math.round(0.8 * containerHeightBeforePlot);
             var relayoutHeight = layoutHeight;
 
             testAutosize(autosize, config, layoutHeight, relayoutHeight, done);
@@ -157,8 +157,8 @@ describe('config argument', function() {
                 fillFrame: false,
                 frameMargins: 0.1
             };
-            var layoutHeight = 360;
-            var relayoutHeight = 288;
+            var layoutHeight = Math.round(0.8 * containerHeightBeforePlot);
+            var relayoutHeight = Math.round(0.8 * containerHeightBeforeRelayout);
 
             testAutosize(autosize, config, layoutHeight, relayoutHeight, done);
         });