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

/uploads: fix manually clicking 'Similar' button.

Browse Source 
Manually clicking Similar called `/iqdb_queries` instead of
`/iqdb_queries.js`, which caused it to update the page incorrectly.
This commit is contained in:
evazion
2019-10-15 00:49:31 -05:00
parent ab5227e8bd
commit 0059597f1e
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/src/javascripts/uploads.js.erb
View File

@@ -5,6 +5,8 @@ import SparkMD5 from 'spark-md5';
let Upload = {}; let Upload = {};
Upload.MAX_FILE_SIZE = <%= Danbooru.config.max_file_size.to_json %> / (1024 * 1024); Upload.MAX_FILE_SIZE = <%= Danbooru.config.max_file_size.to_json %> / (1024 * 1024);
Upload.IQDB_LIMIT = 5;
Upload.IQDB_SIMILARITY = 20;
Upload.initialize_all = function() { Upload.initialize_all = function() {
if ($("#c-uploads,#c-posts").length) { if ($("#c-uploads,#c-posts").length) {
@@ -26,6 +28,7 @@ Upload.initialize_all = function() {
} }
this.initialize_similar(); this.initialize_similar();
this.initialize_submit(); this.initialize_submit();
$("#similar-button").click();
$("#toggle-artist-commentary").on("click.danbooru", function(e) { $("#toggle-artist-commentary").on("click.danbooru", function(e) {
Upload.toggle_commentary(); Upload.toggle_commentary();
@@ -36,10 +39,6 @@ Upload.initialize_all = function() {
if ($("#c-uploads #a-new").length) { if ($("#c-uploads #a-new").length) {
this.initialize_dropzone(); this.initialize_dropzone();
} }
if ($("#iqdb-similar").length) {
this.initialize_iqdb_source();
}
} }
Upload.initialize_submit = function() { Upload.initialize_submit = function() {
@@ -66,12 +65,6 @@ Upload.validate_upload = function (e) {
} }
} }
Upload.initialize_iqdb_source = function() {
if (/^https?:\/\//.test($("#upload_source").val())) {
$.get("/iqdb_queries.js", { url: $("#upload_source").val(), limit: 5, similarity: 20 });
}
}
Upload.initialize_enter_on_tags = function() { Upload.initialize_enter_on_tags = function() {
var $textarea = $("#upload_tag_string, #post_tag_string"); var $textarea = $("#upload_tag_string, #post_tag_string");
var $submit = $textarea.parents("form").find('input[type="submit"]'); var $submit = $textarea.parents("form").find('input[type="submit"]');
@@ -84,8 +77,12 @@ Upload.initialize_enter_on_tags = function() {
Upload.initialize_similar = function() { Upload.initialize_similar = function() {
$("#similar-button").on("click.danbooru", function(e) { $("#similar-button").on("click.danbooru", function(e) {
$.get("/iqdb_queries", {"url": $("#upload_source").val()}).done(function(html) {$("#iqdb-similar").html(html).show()});
e.preventDefault(); e.preventDefault();
let source = $("#upload_source").val();
if (/^https?:\/\//.test(source)) {
$.get("/iqdb_queries.js", { url: source, limit: Upload.IQDB_LIMIT, similarity: Upload.IQDB_SIMILARITY });
}
}); });
} }

2
app/views/iqdb_queries/show.js.erb
View File

@@ -1 +1 @@
$("#iqdb-similar").html("<%= j render "iqdb_queries/matches" %>"); $("#iqdb-similar").html("<%= j render "iqdb_queries/matches" %>").show();