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

fixes #1773

Browse Source
This commit is contained in:
r888888888
2013-06-19 14:04:27 -07:00
parent 5c52e68039
commit cf74b592cd
8 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/notes.js
View File

@@ -669,7 +669,7 @@ $(function() {
if ($("#c-posts").length && $("#a-show").length && $("#image").length) { if ($("#c-posts").length && $("#a-show").length && $("#image").length) {
if ($("#note-locked-notice").length == 0) { if ($("#note-locked-notice").length == 0) {
$("#translate").bind("click", Danbooru.Note.TranslationMode.toggle); $("#translate").bind("click", Danbooru.Note.TranslationMode.toggle);
$(document).bind("keydown.n", Danbooru.Note.TranslationMode.toggle); $(document).bind("keydown", "n", Danbooru.Note.TranslationMode.toggle);
} }
Danbooru.Note.load_all(); Danbooru.Note.load_all();
$("#image").click(Danbooru.Note.Box.toggle_all); $("#image").click(Danbooru.Note.Box.toggle_all);

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

@@ -18,8 +18,8 @@
$(function() { $(function() {
if ($(".paginator").length && (Danbooru.meta("enable-js-navigation") === "true")) { if ($(".paginator").length && (Danbooru.meta("enable-js-navigation") === "true")) {
$(document).bind("keydown.d", Danbooru.Paginator.next_page); $(document).bind("keydown", "d", Danbooru.Paginator.next_page);
$(document).bind("keydown.a", Danbooru.Paginator.prev_page); $(document).bind("keydown", "a", Danbooru.Paginator.prev_page);
} }
}); });

4
app/assets/javascripts/post_popular.js
View File

@@ -22,12 +22,12 @@
Danbooru.PostPopular.initialize_all = function() { Danbooru.PostPopular.initialize_all = function() {
if ($("#c-explore-posts").length) { if ($("#c-explore-posts").length) {
if (Danbooru.meta("enable-js-navigation") === "true") { if (Danbooru.meta("enable-js-navigation") === "true") {
$(document).bind("keydown.a", function(e) { $(document).bind("keydown", "a", function(e) {
Danbooru.PostPopular.nav_prev(); Danbooru.PostPopular.nav_prev();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.d", function(e) { $(document).bind("keydown", "d", function(e) {
Danbooru.PostPopular.nav_next(); Danbooru.PostPopular.nav_next();
e.preventDefault(); e.preventDefault();
}); });

9
app/assets/javascripts/posts.js
View File

@@ -39,7 +39,6 @@
var $fields = $("#tags,#post_tag_string,#upload_tag_string"); var $fields = $("#tags,#post_tag_string,#upload_tag_string");
$fields.autocomplete({ $fields.autocomplete({
minLength: 1,
focus: function() { focus: function() {
return false; return false;
}, },
@@ -126,23 +125,23 @@
Danbooru.Post.initialize_shortcuts = function() { Danbooru.Post.initialize_shortcuts = function() {
if ($("#a-show").length) { if ($("#a-show").length) {
$(document).bind("keydown.e", function(e) { $(document).bind("keydown", "e", function(e) {
$("#post-edit-link").trigger("click"); $("#post-edit-link").trigger("click");
$("#post_tag_string").focus(); $("#post_tag_string").focus();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.a", function(e) { $(document).bind("keydown", "a", function(e) {
Danbooru.Post.nav_prev(); Danbooru.Post.nav_prev();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.d", function(e) { $(document).bind("keydown", "d", function(e) {
Danbooru.Post.nav_next(); Danbooru.Post.nav_next();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.f", function(e) { $(document).bind("keydown", "f", function(e) {
$("#add-to-favorites:visible").trigger("click"); $("#add-to-favorites:visible").trigger("click");
e.preventDefault(); e.preventDefault();
}); });

10
app/assets/javascripts/shortcuts.js
View File

@@ -2,15 +2,15 @@
Danbooru.Shortcuts = {}; Danbooru.Shortcuts = {};
Danbooru.Shortcuts.initialize = function() { Danbooru.Shortcuts.initialize = function() {
$(document).bind("keydown.s", function(e) { $(document).bind("keydown", "s", function(e) {
Danbooru.Shortcuts.nav_scroll_down(); Danbooru.Shortcuts.nav_scroll_down();
}) });
$(document).bind("keydown.w", function(e) { $(document).bind("keydown", "w", function(e) {
Danbooru.Shortcuts.nav_scroll_up(); Danbooru.Shortcuts.nav_scroll_up();
}) });
$(document).bind("keydown.q", function(e) { $(document).bind("keydown", "q", function(e) {
$("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd(); $("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd();
e.preventDefault(); e.preventDefault();
}); });

2
app/assets/javascripts/uploads.js
View File

@@ -16,7 +16,7 @@
} }
Danbooru.Upload.initialize_enter_on_tags = function() { Danbooru.Upload.initialize_enter_on_tags = function() {
$("#upload_tag_string,#post_tag_string").bind("keydown.return", function(e) { $("#upload_tag_string,#post_tag_string").bind("keydown", "return", function(e) {
$("#form").trigger("submit"); $("#form").trigger("submit");
$("#quick-edit-form").trigger("submit"); $("#quick-edit-form").trigger("submit");
e.preventDefault(); e.preventDefault();

5
vendor/assets/javascripts/jquery-ui-1.10.2.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -10,20 +10,25 @@
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
*/ */
/*
* One small change is: now keys are passed by object { keys: '...' }
* Might be useful, when you want to pass some other data to your handler
*/
(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", 10: "return", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 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", 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", 188: ",", 190: ".", 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 186: ";", 191: "/",
191: "/", 224: "meta" 220: "\\", 222: "'", 224: "meta"
}, },
shiftNums: { shiftNums: {
@@ -34,59 +39,59 @@
}; };
function keyHandler( handleObj ) { function keyHandler( handleObj ) {
if ( typeof handleObj.data === "string" ) {
handleObj.data = { keys: handleObj.data };
}
var origHandler = handleObj.handler, // Only care when a possible input has been specified
//use namespace as keys so it works with event delegation as well if ( !handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string" ) {
//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.keys.toLowerCase().split(" "),
textAcceptingInputTypes = ["text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime", "datetime-local", "search", "color", "tel"];
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).prop('contenteditable') == 'true' )) { jQuery.inArray(event.target.type, textAcceptingInputTypes) > -1 ) ) {
return; return;
} }
// Keypress represents characters, not special keys var special = jQuery.hotkeys.specialKeys[ event.keyCode ],
var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], // character codes are available only in keypress
character = String.fromCharCode( event.which ).toLowerCase(), character = event.type === "keypress" && String.fromCharCode( event.which ).toLowerCase(),
key, modif = "", possible = {}; modif = "", possible = {};
// 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 ) {
possible[ modif + special ] = true; possible[ modif + special ] = true;
}
} else { if ( character ) {
possible[ modif + character ] = true; possible[ modif + character ] = true;
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;
} }
} }
@@ -103,4 +108,4 @@
jQuery.event.special[ this ] = { add: keyHandler }; jQuery.event.special[ this ] = { add: keyHandler };
}); });
})( jQuery ); })( this.jQuery );