kopia lustrzana https://github.com/c9/core
Fixed race condition
rodzic
f62b3eb5f2
commit
22f46d3c3d
|
@ -187,10 +187,10 @@ define(function(require, exports, module) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolve() {
|
function resolve() {
|
||||||
console.log("[watchers] resolved change event without dialog", this.tab.path);
|
console.log("[watchers] resolved change event without dialog", path);
|
||||||
doc.tab.classList.remove("conflict");
|
doc.tab.classList.remove("conflict");
|
||||||
delete doc.meta.$merge;
|
delete doc.meta.$merge;
|
||||||
delete changedPaths[this.tab.path];
|
delete changedPaths[path];
|
||||||
}
|
}
|
||||||
|
|
||||||
var doc = tab.document;
|
var doc = tab.document;
|
||||||
|
@ -233,9 +233,9 @@ define(function(require, exports, module) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Show dialogs for changed tabs
|
// Show dialogs for changed tabs
|
||||||
for (path in changedPaths) {
|
for (var changedPath in changedPaths) {
|
||||||
tab = changedPaths[path].tab;
|
tab = changedPaths[changedPath].tab;
|
||||||
data = changedPaths[path].data;
|
data = changedPaths[changedPath].data;
|
||||||
showChangeDialog(tab, data);
|
showChangeDialog(tab, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue