Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 302136 - Two clicks on "Install Now" button are necessary to install an extension - r+a=beng

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177953 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-08-17 16:40:43 +00:00
parent c530b44444
commit 2294affeb4
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/toolkit/mozapps/xpinstall/content/xpinstallConfirm.js
View File

@@ -100,22 +100,33 @@ XPInstallConfirm.init = function ()
okButton.label = bundle.getFormattedString("installButtonDisabledLabel", [_installCountdown.toFixed(1)]);
}
function myfocus() {
function myfocus(event) {
if (_installCountdownInterval == -1)
_installCountdownInterval = setInterval(okButtonCountdown, 100);
// When the dialog is focused, we get *three* focus events, two targeted
// at the document itself and one at the internal XUL element. Only reset
// the counter if the document itself is the target.
if (event.target == document) {
_installCountdown = 2;
okButton.label = bundle.getFormattedString("installButtonDisabledLabel", [_installCountdown.toFixed(1)]);
okButton.disabled = true;
}
}
function myblur() {
if (_installCountdownInterval != -1)
function myblur() {
// When the dialog is blurred, we only get one blur event, targeted
// a the currently focused XUL element. We cannot distinguish between
// an internal focus change and a window change. Stop the countdown, but
// don't disable.
if (_installCountdownInterval != -1) {
clearInterval(_installCountdownInterval);
_installCountdown = 2;
okButton.label = bundle.getFormattedString("installButtonDisabledLabel", [_installCountdown.toFixed(1)]);
okButton.disabled = true;
_installCountdownInterval = -1;
}
}
window.addEventListener("focus", myfocus, true);
window.addEventListener("blur", myblur, true);
document.addEventListener("focus", myfocus, true);
document.addEventListener("blur", myblur, true);
_installCountdownInterval = setInterval(okButtonCountdown, 100);
}