suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Data directory changing required two restarts in Firefox 3.6 on Windows

Browse Source
This commit is contained in:
Dan Stillman 2010-03-12 22:05:18 +00:00
parent 2e76f0128d
commit 14aaf2aa8b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/content/zotero/preferences/preferences.js
View File

@ -91,6 +91,11 @@ function onDataDirUpdate(event) {
if (event.originalTarget && event.originalTarget.tagName == 'button') {
return true;
}
// Fx3.6
else if (event.explicitOriginalTarget && event.explicitOriginalTarget.tagName == 'button') {
return true;
}
// If directory not set or invalid, prompt for location
if (!getDataDirPath()) {
event.stopPropagation();
@ -117,8 +122,8 @@ function onDataDirUpdate(event) {
Zotero.Prefs.set('useDataDir', useDataDir);
var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
.getService(Components.interfaces.nsIAppStartup);
appStartup.quit(Components.interfaces.nsIAppStartup.eRestart);
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit
| Components.interfaces.nsIAppStartup.eRestart);
}
radiogroup.selectedIndex = useDataDir ? 1 : 0;

4
chrome/content/zotero/xpcom/zotero.js
View File

@ -622,8 +622,8 @@ var Zotero = new function(){
if (index == 0) {
var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
.getService(Components.interfaces.nsIAppStartup);
appStartup.quit(Components.interfaces.nsIAppStartup.eRestart);
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit
| Components.interfaces.nsIAppStartup.eRestart);
}
return useProfileDir ? true : file;