From a2da2c1d44916ed0efdf06af5f137a6f1eabca60 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Sun, 8 Jun 2014 21:55:38 -0400
Subject: [PATCH] #2130: Fix similar button on upload page

---
 app/assets/javascripts/uploads.js | 19 ++-----------------
 app/views/uploads/new.html.erb    | 12 ++++++++----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 9feb1ba0c..fd5714c0f 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -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();
     });
   }
 
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index dac76b011..424b68e90 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -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">