From 32cda9a69602402893df8e0c31727c975eafb274 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 27 Aug 2007 20:58:39 +0000
Subject: [PATCH] Closes #571, keystroke to copy citation (rather than
 bibliography entry)

---
 chrome/content/zotero/overlay.js              | 20 ++++++++++++++++---
 .../zotero/preferences/preferences.xul        |  7 +++++++
 chrome/locale/en-US/zotero/preferences.dtd    |  1 +
 defaults/preferences/zotero.js                |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 309008dd1..e75fcfdb1 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -413,6 +413,9 @@ var ZoteroPane = new function()
 			case 'toggleFullscreen':
 				ZoteroPane.fullScreen();
 				break;
+			case 'copySelectedItemCitationsToClipboard':
+				ZoteroPane.copySelectedItemsToClipboard(true)
+				break;
 			case 'copySelectedItemsToClipboard':
 				ZoteroPane.copySelectedItemsToClipboard();
 				break;
@@ -1090,7 +1093,7 @@ var ZoteroPane = new function()
 	}
 	
 	
-	function copySelectedItemsToClipboard() {
+	function copySelectedItemsToClipboard(asCitations) {
 		var items = this.getSelectedItems();
 		if (!items.length) {
 			return;
@@ -1112,10 +1115,21 @@ var ZoteroPane = new function()
 		var [mode, format] = Zotero.Prefs.get("export.quickCopy.setting").split('=');
 		
 		if (mode == 'bibliography') {
-			Zotero_File_Interface.copyItemsToClipboard(items, format);
+			if (asCitations) {
+				Zotero_File_Interface.copyCitationToClipboard(items, format);
+			}
+			else {
+				Zotero_File_Interface.copyItemsToClipboard(items, format);
+			}
 		}
 		else if (mode == 'export') {
-			Zotero_File_Interface.exportItemsToClipboard(items, format);
+			// Copy citations doesn't work in export mode
+			if (asCitations) {
+				return;
+			}
+			else {
+				Zotero_File_Interface.exportItemsToClipboard(items, format);
+			}
 		}
 	}
 	
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 714493b88..0156dd108 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -295,6 +295,7 @@ To add a new preference:
 			<preference id="pref-keys-newItem" name="extensions.zotero.keys.newItem" type="string"/>
 			<preference id="pref-keys-newNote" name="extensions.zotero.keys.newNote" type="string"/>
 			<preference id="pref-keys-toggleTagSelector" name="extensions.zotero.keys.toggleTagSelector" type="string"/>
+			<preference id="pref-keys-copySelectedItemCitationsToClipboard" name="extensions.zotero.keys.copySelectedItemCitationsToClipboard" type="string"/>
 			<preference id="pref-keys-copySelectedItemsToClipboard" name="extensions.zotero.keys.copySelectedItemsToClipboard" type="string"/>
 			<preference id="pref-keys-overrideGlobal" name="extensions.zotero.keys.overrideGlobal" type="bool"/>
 		</preferences>
@@ -349,6 +350,12 @@ To add a new preference:
 					<textbox id="textbox-toggleTagSelector" maxlength="1" size="1" preference="pref-keys-toggleTagSelector"/>
 				</row>
 				
+				<row>
+					<label value="&zotero.preferences.keys.copySelectedItemCitationsToClipboard;" control="textbox-copySelectedItemCitationsToClipboard"/>
+					<label/>
+					<textbox id="textbox-copySelectedItemCitationsToClipboard" maxlength="1" size="1" preference="pref-keys-copySelectedItemCitationsToClipboard"/>
+				</row>
+				
 				<row>
 					<label value="&zotero.preferences.keys.copySelectedItemsToClipboard;" control="textbox-copySelectedItemsToClipboard"/>
 					<label/>
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 5fc824264..d4ce58171 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -64,6 +64,7 @@
 <!ENTITY zotero.preferences.keys.newItem					"Create a new item">
 <!ENTITY zotero.preferences.keys.newNote					"Create a new note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector		"Toggle Tag Selector">
+<!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard		"Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard		"Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.overrideGlobal			"Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect		"Changes take effect in new windows only">
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index b84e58bd1..20070889e 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -39,6 +39,7 @@ pref("extensions.zotero.keys.quicksearch", 'K');
 pref("extensions.zotero.keys.newItem", 'N');
 pref("extensions.zotero.keys.newNote", 'O');
 pref("extensions.zotero.keys.toggleTagSelector", 'T');
+pref("extensions.zotero.keys.copySelectedItemCitationsToClipboard", 'A');
 pref("extensions.zotero.keys.copySelectedItemsToClipboard", 'C');
 
 // Fulltext indexing