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

fixes #1774

Browse Source
This commit is contained in:
r888888888
2013-06-19 14:29:31 -07:00
parent 715d1a42fe
commit 1ce24dd7c0
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,12 @@
}); });
} }
}); });
$fields.on("autocompleteopen", function() {
Danbooru.autocompleting = true;
});
$fields.on("autocompleteclose", function() {
setTimeout(function() {Danbooru.autocompleting = false;}, 100);
});
var render_tag = function(list, tag) { var render_tag = function(list, tag) {
var $link = $("<a/>").addClass("tag-type-" + tag.category).text(tag.label); var $link = $("<a/>").addClass("tag-type-" + tag.category).text(tag.label);

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

@@ -17,8 +17,10 @@
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"); if (!Danbooru.autocompleting) {
$("#quick-edit-form").trigger("submit"); $("#form").trigger("submit");
$("#quick-edit-form").trigger("submit");
}
e.preventDefault(); e.preventDefault();
}); });
} }

2
config/danbooru_default_config.rb
View File

@@ -4,7 +4,7 @@ module Danbooru
class Configuration class Configuration
# The version of this Danbooru. # The version of this Danbooru.
def version def version
"2.17.0" "2.18.0"
end end
# The name of this Danbooru. # The name of this Danbooru.