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

#2130: Fix similar button on upload page

Browse Source
This commit is contained in:
Toks
2014-06-08 21:55:38 -04:00
parent abfd48d58a
commit a2da2c1d44
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,23 +36,8 @@
Danbooru.Upload.initialize_similar = function() {
$("#similar-button").click(function(e) {
var old_source_name = $("#upload_source").attr("name");
var old_file_name = $("#upload_file").attr("name");
var old_action = $("#form").attr("action");
$("#upload_source").attr("name", "url");
$("#upload_file").attr("name", "file");
$("#form").attr("target", "_blank");
$("#form").attr("action", "http://danbooru.iqdb.org/");
$("#form").trigger("submit");
$("#upload_source").attr("name", old_source_name);
$("#upload_file").attr("name", old_file_name);
$("#form").attr("target", "");
$("#form").attr("action", old_action);
e.preventDefault();
$.post("/iqdb_queries", {"url": $("#upload_source").val()}).done(function(html) {$("#iqdb-similar").html(html).show()});
e.preventDefault();
});
}

12
app/views/uploads/new.html.erb
View File

@@ -65,10 +65,14 @@
<%= f.text_field :parent_id %>
</div>
<% if Danbooru.config.iqdb_hostname_and_port && params[:url] %>
<div class="input" id="iqdb-similar">
<p><em>Loading similar...</em></p>
</div>
<% if Danbooru.config.iqdb_hostname_and_port %>
<% if params[:url] %>
<div class="input" id="iqdb-similar">
<p><em>Loading similar...</em></p>
</div>
<% else %>
<div class="input" id="iqdb-similar" style="display: none;"></div>
<% end %>
<% end %>
<div class="input">