From 4d9858f2cc70094cf27bad2d4082642209afd3a8 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 21 Feb 2013 14:48:21 -0500
Subject: [PATCH] fixes keyboard navigator

---
 app/assets/javascripts/paginator.js         |  5 +-
 vendor/assets/javascripts/jquery.hotkeys.js | 53 ++++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/paginator.js
index 1d2f55bf8..9ec777bae 100644
--- a/app/assets/javascripts/paginator.js
+++ b/app/assets/javascripts/paginator.js
@@ -2,6 +2,7 @@
   Danbooru.Paginator = {};
   
   Danbooru.Paginator.next_page = function() {
+    console.log("next");
     if ($('.paginator li span').parent().next().length) {
       window.location = $('.paginator li span').parent().next().find('a').attr('href');
     }
@@ -15,7 +16,7 @@
 })();
 
 $(function() {
-  $(document).bind("keypress", 'right', function(){ Danbooru.Paginator.next_page() });
-  $(document).bind("keypress", 'left', function(){ Danbooru.Paginator.prev_page() });
+  $(document).bind("keydown.right", Danbooru.Paginator.next_page);
+  $(document).bind("keydown.left", Danbooru.Paginator.prev_page);
 });
 
diff --git a/vendor/assets/javascripts/jquery.hotkeys.js b/vendor/assets/javascripts/jquery.hotkeys.js
index fbd71c71e..53e08d93a 100644
--- a/vendor/assets/javascripts/jquery.hotkeys.js
+++ b/vendor/assets/javascripts/jquery.hotkeys.js
@@ -11,43 +11,50 @@
 */
 
 (function(jQuery){
-	
+
 	jQuery.hotkeys = {
-		version: "0.8",
+		version: "0.8+",
 
 		specialKeys: {
 			8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
 			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 
+			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
 			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", 
-			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 
-			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
+			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
+			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
+			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".",
+			191: "/", 224: "meta"
 		},
-	
+
 		shiftNums: {
-			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", 
-			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", 
+			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
+			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
 			".": ">",  "/": "?",  "\\": "|"
 		}
 	};
 
 	function keyHandler( handleObj ) {
-		// Only care when a possible input has been specified
-		if ( typeof handleObj.data !== "string" ) {
+
+		var origHandler = handleObj.handler,
+			//use namespace as keys so it works with event delegation as well
+			//will also allow removing listeners of a specific key combination
+			//and support data objects
+			keys = (handleObj.namespace || "").toLowerCase().split(" ");
+			keys = jQuery.map(keys, function(key) { return key.split("."); });
+
+		//no need to modify handler if no keys specified
+		if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) {
 			return;
 		}
-		
-		var origHandler = handleObj.handler,
-			keys = handleObj.data.toLowerCase().split(" ");
-	
+
 		handleObj.handler = function( event ) {
 			// Don't fire in text-accepting inputs that we didn't directly bind to
+			// important to note that $.fn.prop is only available on jquery 1.6+
 			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				 event.target.type === "text") ) {
+				event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) {
 				return;
 			}
-			
+
 			// Keypress represents characters, not special keys
 			var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
 				character = String.fromCharCode( event.which ).toLowerCase(),
@@ -55,20 +62,20 @@
 
 			// check combinations (alt|ctrl|shift+anything)
 			if ( event.altKey && special !== "alt" ) {
-				modif += "alt+";
+				modif += "alt_";
 			}
 
 			if ( event.ctrlKey && special !== "ctrl" ) {
-				modif += "ctrl+";
+				modif += "ctrl_";
 			}
-			
+
 			// TODO: Need to make sure this works consistently across platforms
 			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
-				modif += "meta+";
+				modif += "meta_";
 			}
 
 			if ( event.shiftKey && special !== "shift" ) {
-				modif += "shift+";
+				modif += "shift_";
 			}
 
 			if ( special ) {
@@ -79,7 +86,7 @@
 				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
 
 				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-				if ( modif === "shift+" ) {
+				if ( modif === "shift_" ) {
 					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
 				}
 			}