diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 89daea7ce..579dda3a0 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -669,7 +669,7 @@ $(function() { if ($("#c-posts").length && $("#a-show").length && $("#image").length) { if ($("#note-locked-notice").length == 0) { $("#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(); $("#image").click(Danbooru.Note.Box.toggle_all); diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/paginator.js index 4f7988a22..202ce86ed 100644 --- a/app/assets/javascripts/paginator.js +++ b/app/assets/javascripts/paginator.js @@ -18,8 +18,8 @@ $(function() { if ($(".paginator").length && (Danbooru.meta("enable-js-navigation") === "true")) { - $(document).bind("keydown.d", Danbooru.Paginator.next_page); - $(document).bind("keydown.a", Danbooru.Paginator.prev_page); + $(document).bind("keydown", "d", Danbooru.Paginator.next_page); + $(document).bind("keydown", "a", Danbooru.Paginator.prev_page); } }); diff --git a/app/assets/javascripts/post_popular.js b/app/assets/javascripts/post_popular.js index 12715d294..013bc2680 100644 --- a/app/assets/javascripts/post_popular.js +++ b/app/assets/javascripts/post_popular.js @@ -22,12 +22,12 @@ Danbooru.PostPopular.initialize_all = function() { if ($("#c-explore-posts").length) { if (Danbooru.meta("enable-js-navigation") === "true") { - $(document).bind("keydown.a", function(e) { + $(document).bind("keydown", "a", function(e) { Danbooru.PostPopular.nav_prev(); e.preventDefault(); }); - $(document).bind("keydown.d", function(e) { + $(document).bind("keydown", "d", function(e) { Danbooru.PostPopular.nav_next(); e.preventDefault(); }); diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 3e3c49344..56b18770a 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -39,7 +39,6 @@ var $fields = $("#tags,#post_tag_string,#upload_tag_string"); $fields.autocomplete({ - minLength: 1, focus: function() { return false; }, @@ -126,23 +125,23 @@ Danbooru.Post.initialize_shortcuts = function() { if ($("#a-show").length) { - $(document).bind("keydown.e", function(e) { + $(document).bind("keydown", "e", function(e) { $("#post-edit-link").trigger("click"); $("#post_tag_string").focus(); e.preventDefault(); }); - $(document).bind("keydown.a", function(e) { + $(document).bind("keydown", "a", function(e) { Danbooru.Post.nav_prev(); e.preventDefault(); }); - $(document).bind("keydown.d", function(e) { + $(document).bind("keydown", "d", function(e) { Danbooru.Post.nav_next(); e.preventDefault(); }); - $(document).bind("keydown.f", function(e) { + $(document).bind("keydown", "f", function(e) { $("#add-to-favorites:visible").trigger("click"); e.preventDefault(); }); diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index 3fb7abbae..6349aaf51 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -2,15 +2,15 @@ Danbooru.Shortcuts = {}; Danbooru.Shortcuts.initialize = function() { - $(document).bind("keydown.s", function(e) { + $(document).bind("keydown", "s", function(e) { Danbooru.Shortcuts.nav_scroll_down(); - }) + }); - $(document).bind("keydown.w", function(e) { + $(document).bind("keydown", "w", function(e) { 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(); e.preventDefault(); }); diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js index eeaa9ddac..26e9796c7 100644 --- a/app/assets/javascripts/uploads.js +++ b/app/assets/javascripts/uploads.js @@ -16,7 +16,7 @@ } 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"); $("#quick-edit-form").trigger("submit"); e.preventDefault(); diff --git a/vendor/assets/javascripts/jquery-ui-1.10.2.min.js b/vendor/assets/javascripts/jquery-ui-1.10.2.min.js index 3e855f57b..342a58a40 100644 --- a/vendor/assets/javascripts/jquery-ui-1.10.2.min.js +++ b/vendor/assets/javascripts/jquery-ui-1.10.2.min.js @@ -57,4 +57,9 @@ /*! jQuery UI - v1.10.2 - 2013-03-14 * http://jqueryui.com * Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ - (function(e){var t=0;e.widget("ui.autocomplete",{version:"1.10.2",defaultElement:"",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,undefined;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:case a.NUMPAD_ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,s.preventDefault(),undefined;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),undefined):(this._searchTimeout(e),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(e),this._change(e),undefined)}}),this._initSource(),this.menu=e("