Skip to content

fix(uiGrid): Fix race condition in data watcher #4902

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
Dec 29, 2015
Merged

fix(uiGrid): Fix race condition in data watcher #4902

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: 6 additions & 1 deletion src/js/core/directives/ui-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
}
}

var mostRecentData;

function dataWatchFunction(newData) {
// gridUtil.logDebug('dataWatch fired');
var promises = [];
Expand All @@ -90,6 +92,8 @@
}
}

mostRecentData = newData;

if (newData) {
// columns length is greater than the number of row header columns, which don't count because they're created automatically
var hasColumns = self.grid.columns.length > (self.grid.rowHeaderColumns ? self.grid.rowHeaderColumns.length : 0);
Expand Down Expand Up @@ -118,7 +122,8 @@
}

$q.all(promises).then(function() {
self.grid.modifyRows(newData)
// use most recent data, rather than the potentially outdated data passed into watcher handler
self.grid.modifyRows(mostRecentData)
.then(function () {
// if (self.viewport) {
self.grid.redrawInPlace(true);
Expand Down