Merge r1437 to tag

This commit is contained in:
Dan Stillman 2007-04-28 05:55:26 +00:00
parent 27e2d7e873
commit 38ff38a8e7
2 changed files with 2 additions and 2 deletions

View File

@ -357,8 +357,7 @@
// Used for loading the changelog after upgrades
if (Zotero.initialURL) {
gBrowser.selectedTab = gBrowser.addTab(Zotero.initialURL);
Zotero.initialURL = null;
setTimeout("gBrowser.selectedTab = gBrowser.addTab(Zotero.initialURL); Zotero.initialURL = null;", 1);
}
}
else {

View File

@ -33,6 +33,7 @@
var wizard = document.getElementById('zotero-schema-upgrade');
wizard.getButton('cancel').setAttribute('disabled', true);
wizard.canRewind = false;
wizard.getButton('finish').focus(); // prevent focusing of changelog link
}