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

Merge pull request #3362 from BrokenEagle/feat-client-input-validation

Browse Source 
Moved input existence validations to client (#3352)
This commit is contained in:
Albert Yi
2017-11-21 10:56:14 -08:00
committed by GitHub
parent 051c17953d f91e11bb41
commit 4d6dc895d6
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
this.initialize_info_bookmarklet();
this.initialize_similar();
this.initialize_shortcuts();
this.initialize_submit();
$("#related-tags-button").trigger("click");
$("#toggle-artist-commentary").click(function(e) {
@@ -25,6 +26,28 @@
}
}
Danbooru.Upload.initialize_submit = function() {
$("#form").submit(function(e) {
var error_messages = [];
if (($("#upload_file").val() === "") && ($("#upload_source").val() === "")) {
error_messages.push("Must choose file or specify source");
}
if (!$("#upload_rating_s")[0].checked && !$("#upload_rating_q")[0].checked && !$("#upload_rating_e")[0].checked &&
($("#upload_tag_string").val().search(/\brating:[sqe]/) < 0)) {
error_messages.push("Must specify a rating");
}
if (error_messages.length === 0) {
$("#submit-button")[0].setAttribute("disabled","true");
$("#submit-button")[0].setAttribute("value","Submitting...");
$("#client-errors").hide();
} else {
$("#client-errors")[0].innerHTML = "<strong>Error</strong>: " + error_messages.join(", ");
$("#client-errors").show();
e.preventDefault();
}
});
}
Danbooru.Upload.initialize_shortcuts = function() {
Danbooru.keydown("e", "edit", function(e) {
$("#upload_tag_string").focus();