From 3420b4874af1d192db95b6cce80b9881dd1beaa4 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 9 Jul 2015 18:00:15 -0400
Subject: [PATCH] Tweaks for application menu on OS X

- Restore About Zotero item
- Fix Quit item
- Close Standalone when Standalone window is closed (we did this before,
  but apparently having our own hidden window breaks that mechanism)
---
 chrome/content/zotero/locale/csl                  |  2 +-
 chrome/content/zotero/standalone/hiddenWindow.xul | 11 ++++++++---
 chrome/content/zotero/standalone/standalone.js    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 17bc27f4a..d2b612f8a 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 17bc27f4a1835b9f23e5daea98fb61ee2af94072
+Subproject commit d2b612f8a6f764cbd66e67238636fac3888a7736
diff --git a/chrome/content/zotero/standalone/hiddenWindow.xul b/chrome/content/zotero/standalone/hiddenWindow.xul
index a9bf7df7d..b34f6a173 100644
--- a/chrome/content/zotero/standalone/hiddenWindow.xul
+++ b/chrome/content/zotero/standalone/hiddenWindow.xul
@@ -36,11 +36,11 @@
 	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
 ]>
 
-<window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
+<window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 	<commandset id="mainCommandSet">
 		<!--FILE-->
 		<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
-		<command id="cmd_close" oncommand="window.close();"/>
 	</commandset>
 	
 	<keyset id="mainKeyset">
@@ -49,7 +49,12 @@
 
 	<menubar id="main-menubar">
 		<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
-			<menupopup id="menu_FilePopup"/>
+			<menupopup id="menu_FilePopup">
+                <menuitem id="aboutName"
+                          accesskey="&aboutProduct.accesskey;"
+                          label="&aboutProduct.label;"
+                          oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').ZoteroPane.openAboutDialog();"/>
+            </menupopup>
 		</menu>
 	</menubar>
 </window>
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 0d6e66698..cba105a63 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -144,7 +144,7 @@ const ZoteroStandalone = new function() {
 	 * Called before standalone window is closed
 	 */
 	this.onUnload = function() {
-		ZoteroPane.destroy();
+		goQuitApplication();
 	}
 }