Plots.resize: reject old promises

antoinerg · antoinerg · commit deb32ff778b7 · 2019-11-29T18:05:17.000-05:00
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -81,6 +81,9 @@ plots.resize = function(gd) {
             reject(new Error('Resize must be passed a displayed plot div element.'));
         }
 
+        if(gd._rejectResize) gd._rejectResize();
+        gd._rejectResize = reject;
+
         if(gd._redrawTimer) clearTimeout(gd._redrawTimer);
 
         gd._redrawTimer = setTimeout(function() {
diff --git a/test/jasmine/tests/plots_test.js b/test/jasmine/tests/plots_test.js
@@ -412,6 +412,27 @@ describe('Test Plots', function() {
                     .then(done);
             });
         });
+
+        describe('returns Promises', function() {
+            afterEach(destroyGraphDiv);
+
+            it('should reject or resolve them all', function(done) {
+                gd = createGraphDiv();
+                var p = [];
+                Plotly.newPlot(gd, [{y: [5, 2, 5]}])
+                    .then(function() {
+                        // First call should get rejected
+                        p.push(Plotly.Plots.resize(gd).catch(function() {
+                            return Promise.resolve(true);
+                        }));
+                        // because we call the function again within 100ms
+                        p.push(Plotly.Plots.resize(gd));
+                        return Promise.all(p);
+                    })
+                    .catch(failTest)
+                    .then(done);
+            });
+        });
     });
 
     describe('Plots.purge', function() {

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ plots.resize = function(gd) {`
`81`	`81`	`reject(new Error('Resize must be passed a displayed plot div element.'));`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ if(gd._rejectResize) gd._rejectResize();`
	`85`	`+ gd._rejectResize = reject;`
	`86`	`+`
`84`	`87`	`if(gd._redrawTimer) clearTimeout(gd._redrawTimer);`
`85`	`88`
`86`	`89`	`gd._redrawTimer = setTimeout(function() {`