Merge r1437 to tag
This commit is contained in:
parent
27e2d7e873
commit
38ff38a8e7
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user