www

commit a67521e9dd606744fff8057a1bbf59f4f1db2411
parent df67de125e57cdb1e183d5b6a47d12aa4175d33f
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 12 Aug 2014 19:18:29 -0400

Closes #500, Remove DOM_VK_ENTER

Diffstat:
M
chrome/content/zotero/bindings/zoterosearch.xml
 | 
1
-
M
chrome/content/zotero/integration/quickFormat.js
 | 
4
++--
M
chrome/content/zotero/zoteroPane.js
 | 
2
+-

3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/bindings/zoterosearch.xml b/chrome/content/zotero/bindings/zoterosearch.xml
@@ -242,7 +242,6 @@
 				<![CDATA[
 					switch (event.keyCode) {
 						case event.DOM_VK_RETURN:
-						case event.DOM_VK_ENTER:
 							this.active = true;
 							
 							if (event.shiftKey) {
diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
@@ -1032,7 +1032,7 @@ var Zotero_QuickFormat = new function () {
 		if(qfGuidance) qfGuidance.hide();
 		
 		var keyCode = event.keyCode;
-		if(keyCode === event.DOM_VK_RETURN || keyCode === event.DOM_VK_ENTER) {
+		if (keyCode === event.DOM_VK_RETURN) {
 			event.preventDefault();
 			if(!_bubbleizeSelected() && !_getEditorContent()) {
 				_accept();
@@ -1234,7 +1234,7 @@ var Zotero_QuickFormat = new function () {
 	 */
 	this.onPanelKeyPress = function(event) {
 		var keyCode = event.keyCode;
-		if(keyCode === event.DOM_VK_RETURN || keyCode === event.DOM_VK_ENTER) {
+		if (keyCode === event.DOM_VK_RETURN) {
 			document.getElementById("citation-properties").hidePopup();
 		}
 	};
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -1890,7 +1890,7 @@ var ZoteroPane = new function()
 				ZoteroPane_Local.clearItemsPaneMessage();
 			}, 1);
 		}
-		else if (event.keyCode == event.DOM_VK_RETURN || event.keyCode == event.DOM_VK_ENTER) {
+		else if (event.keyCode == event.DOM_VK_RETURN) {
 			ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('searchInProgress'));
 			setTimeout(function () {
 				ZoteroPane_Local.search(true);