Skip to content

Promises: Ensure all gd._promises resolve before final resolve #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2016
+4 −3
Merged

Promises: Ensure all gd._promises resolve before final resolve #521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Plotly.plot = function(gd, data, layout, config) {
gd.emit('plotly_afterplot');
}

var donePlotting = Lib.syncOrAsync([
Lib.syncOrAsync([
Plots.previousPromises,
marginPushers,
marginPushersAgain,
Expand All @@ -333,8 +333,9 @@ Plotly.plot = function(gd, data, layout, config) {

// even if everything we did was synchronous, return a promise
// so that the caller doesn't care which route we took
return (donePlotting && donePlotting.then) ?
donePlotting : Promise.resolve(gd);
return Promise.all(gd._promises).then(function() {
return gd;
});
};

// Get the container div: we store all variables for this plot as
Expand Down