jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes keyboard navigator

Browse Source
This commit is contained in:
albert
2013-02-21 14:48:21 -05:00
parent e20c50d496
commit 4d9858f2cc
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/paginator.js
View File

@@ -2,6 +2,7 @@
Danbooru.Paginator = {}; Danbooru.Paginator = {};
Danbooru.Paginator.next_page = function() { Danbooru.Paginator.next_page = function() {
console.log("next");
if ($('.paginator li span').parent().next().length) { if ($('.paginator li span').parent().next().length) {
window.location = $('.paginator li span').parent().next().find('a').attr('href'); window.location = $('.paginator li span').parent().next().find('a').attr('href');
} }
@@ -15,7 +16,7 @@
})(); })();
$(function() { $(function() {
$(document).bind("keypress", 'right', function(){ Danbooru.Paginator.next_page() }); $(document).bind("keydown.right", Danbooru.Paginator.next_page);
$(document).bind("keypress", 'left', function(){ Danbooru.Paginator.prev_page() }); $(document).bind("keydown.left", Danbooru.Paginator.prev_page);
}); });

33
vendor/assets/javascripts/jquery.hotkeys.js vendored
View File

@@ -13,7 +13,7 @@
(function(jQuery){ (function(jQuery){
jQuery.hotkeys = { jQuery.hotkeys = {
version: "0.8", version: "0.8+",
specialKeys: { specialKeys: {
8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
@@ -22,7 +22,8 @@
96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", 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 : "/", 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", 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" 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".",
191: "/", 224: "meta"
}, },
shiftNums: { shiftNums: {
@@ -33,18 +34,24 @@
}; };
function keyHandler( handleObj ) { 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; return;
} }
var origHandler = handleObj.handler,
keys = handleObj.data.toLowerCase().split(" ");
handleObj.handler = function( event ) { handleObj.handler = function( event ) {
// Don't fire in text-accepting inputs that we didn't directly bind to // 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 ) || 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; return;
} }
@@ -55,20 +62,20 @@
// check combinations (alt|ctrl|shift+anything) // check combinations (alt|ctrl|shift+anything)
if ( event.altKey && special !== "alt" ) { if ( event.altKey && special !== "alt" ) {
modif += "alt+"; modif += "alt_";
} }
if ( event.ctrlKey && special !== "ctrl" ) { if ( event.ctrlKey && special !== "ctrl" ) {
modif += "ctrl+"; modif += "ctrl_";
} }
// TODO: Need to make sure this works consistently across platforms // TODO: Need to make sure this works consistently across platforms
if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
modif += "meta+"; modif += "meta_";
} }
if ( event.shiftKey && special !== "shift" ) { if ( event.shiftKey && special !== "shift" ) {
modif += "shift+"; modif += "shift_";
} }
if ( special ) { if ( special ) {
@@ -79,7 +86,7 @@
possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
// "$" can be triggered as "Shift+4" or "Shift+$" or just "$" // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
if ( modif === "shift+" ) { if ( modif === "shift_" ) {
possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
} }
} }