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

Handle delays for all non-cancel buttons in waitForDialog() in tests

Browse source 
When the button delay is enabled, all buttons other than Cancel are
delayed.
This commit is contained in:
Dan Stillman 2015-06-10 00:32:42 -04:00
parent 2f7d2c09f0
commit 79f0e4761f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/content/support.js
View file

@ -120,17 +120,17 @@ function waitForDialog(onOpen, button='accept') {
failure = e; failure = e;
} }
} }
if (button == 'accept') { if (button != 'cancel') {
let deferred = Zotero.Promise.defer(); let deferred = Zotero.Promise.defer();
function acceptWhenEnabled() { function acceptWhenEnabled() {
// Handle delayed accept buttons // Handle delayed buttons
if (dialog.document.documentElement.getButton('accept').disabled) { if (dialog.document.documentElement.getButton(button).disabled) {
setTimeout(function () { setTimeout(function () {
acceptWhenEnabled(); acceptWhenEnabled();
}, 250); }, 250);
} }
else { else {
dialog.document.documentElement.acceptDialog(); dialog.document.documentElement.getButton(button).click();
if (failure) { if (failure) {
deferred.reject(failure); deferred.reject(failure);
} }