mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Don't retry cancelled conflicts immediately

Browse source 
If other items were saved in the same batch, the conflict resolution
window could reappear immediately after cancelling it.
This commit is contained in:
Dan Stillman 2016-04-27 05:41:51 -04:00
parent c146adce38
commit 295e9f3ecf
3 changed files with 111 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/tests/syncLocalTest.js
View file

@ -854,7 +854,7 @@ describe("Zotero.Sync.Data.Local", function() {
json.data.note = noteText2;
downloadedJSON.push(json);
// Delete object locally
// Modify local version
obj.setNote(noteText1);
waitForWindow('chrome://zotero/content/merge.xul', function (dialog) {