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

Use process id instead of bundle identifier to activate Mac app

Browse source 
This prevents a second copy of Zotero from being launched if you're
running the Zotero beta and click on a word processor plugin button
while a dialog is already open.
This commit is contained in:
Dan Stillman 2020-03-09 20:17:09 -04:00
parent 6e38c36804
commit 2acec4184a
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
chrome/content/zotero/xpcom/utilities_internal.js
View file

@ -2031,13 +2031,6 @@ Zotero.Utilities.Internal.activate = new function() {
return function(win) { return function(win) {
if (Zotero.isMac) { if (Zotero.isMac) {
const BUNDLE_IDS = {
"Zotero":"org.zotero.zotero",
"Firefox":"org.mozilla.firefox",
"Aurora":"org.mozilla.aurora",
"Nightly":"org.mozilla.nightly"
};
if (win) { if (win) {
Components.utils.import("resource://gre/modules/ctypes.jsm"); Components.utils.import("resource://gre/modules/ctypes.jsm");
win.focus(); win.focus();
@ -2075,7 +2068,13 @@ Zotero.Utilities.Internal.activate = new function() {
); );
}, false); }, false);
} else { } else {
Zotero.Utilities.Internal.executeAppleScript('tell application id "'+BUNDLE_IDS[Zotero.appName]+'" to activate'); let pid = Zotero.Utilities.Internal.getProcessID();
let script = `
tell application "System Events"
set frontmost of the first process whose unix id is ${pid} to true
end tell
`;
Zotero.Utilities.Internal.executeAppleScript(script);
} }
} else if(!Zotero.isWin && win) { } else if(!Zotero.isWin && win) {
Components.utils.import("resource://gre/modules/ctypes.jsm"); Components.utils.import("resource://gre/modules/ctypes.jsm");
@ -2289,16 +2288,26 @@ Zotero.Utilities.Internal.activate = new function() {
Zotero.Utilities.Internal.sendToBack = function() { Zotero.Utilities.Internal.sendToBack = function() {
if (Zotero.isMac) { if (Zotero.isMac) {
let pid = Zotero.Utilities.Internal.getProcessID();
Zotero.Utilities.Internal.executeAppleScript(` Zotero.Utilities.Internal.executeAppleScript(`
tell application "System Events" tell application "System Events"
if frontmost of application id "org.zotero.zotero" then set myProcess to first process whose unix id is ${pid}
set visible of process "Zotero" to false if frontmost of myProcess then
set visible of myProcess to false
end if end if
end tell end tell
`); `);
} }
} }
Zotero.Utilities.Internal.getProcessID = function () {
return Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULRuntime)
.processID;
};
/** /**
* Base64 encode / decode * Base64 encode / decode
* From http://www.webtoolkit.info/ * From http://www.webtoolkit.info/