From 83bc0628db8489cad00d0bea7110970eb38d35c1 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Mon, 16 Dec 2013 20:27:15 -0500 Subject: [PATCH] Fix Zotero.Integration.activate() with no args in Mac Aurora/Nightly This is only used when there is a window open in the background anyway --- chrome/content/zotero/xpcom/integration.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index 0c7f385c6b..2f7287d7c9 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -313,7 +313,8 @@ Zotero.Integration = new function() { const BUNDLE_IDS = { "Zotero":"org.zotero.zotero", "Firefox":"org.mozilla.firefox", - "Minefield":"org.mozilla.minefield" + "Aurora":"org.mozilla.aurora", + "Nightly":"org.mozilla.nightly" }; if(win) { @@ -353,13 +354,7 @@ Zotero.Integration = new function() { ); }, false); } else { - if(Zotero.oscpu == "PPC Mac OS X 10.4" || Zotero.oscpu == "Intel Mac OS X 10.4" - || !BUNDLE_IDS[Zotero.appName]) { - // 10.4 doesn't support "tell application id" - _executeAppleScript('tell application "'+Zotero.appName+'" to activate'); - } else { - _executeAppleScript('tell application id "'+BUNDLE_IDS[Zotero.appName]+'" to activate'); - } + _executeAppleScript('tell application id "'+BUNDLE_IDS[Zotero.appName]+'" to activate'); } } else if(!Zotero.isWin && win) { Components.utils.import("resource://gre/modules/ctypes.jsm");