Merge pull request #2710 from rafalbromirski/plots-resize-layout-check

Plots.resize - additional check for gd.layout

Author: alexcjohnson

src/plots/plots.js

@@ -89,8 +89,8 @@ plots.resize = function(gd) {
         if(gd._redrawTimer) clearTimeout(gd._redrawTimer);
 
         gd._redrawTimer = setTimeout(function() {
-            // return if there is nothing to resize
-            if(gd.layout.width && gd.layout.height) {
+            // return if there is nothing to resize or is hidden
+            if(!gd.layout || (gd.layout.width && gd.layout.height) || isHidden(gd)) {
                 resolve(gd);
                 return;
             }

test/jasmine/tests/plot_promise_test.js

@@ -2,7 +2,7 @@ var Plotly = require('@lib/index');
 var Events = require('@src/lib/events');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
-
+var failTest = require('../assets/fail_test');
 
 describe('Plotly.___ methods', function() {
     'use strict';
@@ -468,7 +468,9 @@ describe('Plotly.___ methods', function() {
                 expect(gd).toBeDefined();
                 expect(typeof gd).toBe('object');
                 expect(gd.layout).toBeDefined();
-            }).then(done);
+            })
+            .catch(failTest)
+            .then(done);
         });
 
         it('should return a rejected promise if gd is hidden', function(done) {
@@ -478,7 +480,9 @@ describe('Plotly.___ methods', function() {
             }, function(err) {
                 expect(err).toBeDefined();
                 expect(err.message).toBe('Resize must be passed a displayed plot div element.');
-            }).then(done);
+            })
+            .catch(failTest)
+            .then(done);
         });
 
         it('should return a rejected promise if gd is detached from the DOM', function(done) {
@@ -488,7 +492,30 @@ describe('Plotly.___ methods', function() {
             }, function(err) {
                 expect(err).toBeDefined();
                 expect(err.message).toBe('Resize must be passed a displayed plot div element.');
-            }).then(done);
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('should return a resolved promise if plot has been purged and there is nothing to resize', function(done) {
+            var resizePromise = Plotly.Plots.resize(initialDiv);
+
+            Plotly.purge(initialDiv);
+            destroyGraphDiv();
+
+            resizePromise
+                .catch(failTest)
+                .then(done);
+        });
+
+        it('should return a resolved promise if plot has been hidden and gd is hidden', function(done) {
+            var resizePromise = Plotly.Plots.resize(initialDiv);
+
+            initialDiv.style.display = 'none';
+
+            resizePromise
+                .catch(failTest)
+                .then(done);
         });
 
         it('errors before even generating a promise if gd is not defined', function() {