From 2833239fa0e4a9eb63e1aea12241104b33761104 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 21 Jan 2018 11:55:24 -0600 Subject: [PATCH] Fix #3513: Missing rating error causes weird behavior in tag list on upload page. Fix bug in the double submit prevention from #2789. Rather than unbinding the enter key on submit, have the enter key click the submit button instead. This avoids form submission when the submit button is disabled. --- app/assets/javascripts/uploads.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js index cb06de3d3..319695d5f 100644 --- a/app/assets/javascripts/uploads.js +++ b/app/assets/javascripts/uploads.js @@ -62,11 +62,12 @@ } Danbooru.Upload.initialize_enter_on_tags = function() { - $("#upload_tag_string,#post_tag_string").on("keydown.danbooru.submit", null, "return", function(e) { + var $textarea = $("#upload_tag_string, #post_tag_string"); + var $submit = $textarea.parents("form").find('input[type="submit"]'); + + $textarea.on("keydown.danbooru.submit", null, "return", function(e) { if (!Danbooru.autocompleting) { - $("#form").trigger("submit"); - $("#quick-edit-form").trigger("submit"); - $("#upload_tag_string,#post_tag_string").off(".submit"); + $submit.click(); } e.preventDefault();