From d8143d0b4103d9ea624803067bef2fe56db958af Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 18 Mar 2013 22:11:54 -0700
Subject: [PATCH] fixes #930

---
 app/assets/javascripts/layout.js      | 5 +++++
 app/assets/javascripts/related_tag.js | 9 ++++++---
 app/assets/javascripts/uploads.js     | 4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js
index 66b2c65b0..566149de2 100644
--- a/app/assets/javascripts/layout.js
+++ b/app/assets/javascripts/layout.js
@@ -1,6 +1,11 @@
 $(function() {
   var $sidebar = $("#sidebar");
   var $content = $("#content");
+  
+  if (!$sidebar.length || !$content.length) {
+    return;
+  }
+  
   var sidebar_offset = $sidebar.offset().top + $sidebar.height();
   var content_offset = $content.offset().top + $content.height();
   var offset = null;
diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index e5ff7bbeb..5e64dfd24 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -14,12 +14,13 @@
     this.common_bind("#related-artists-button", "artist");
     this.common_bind("#related-characters-button", "character");
     this.common_bind("#related-copyrights-button", "copyright");
+    $("#find-artist-button").click(Danbooru.RelatedTag.find_artist);
     if ($("#c-uploads").length) {
-      if ($("#upload_source").val().match(/pixiv\.net/)){
+      if ($("#upload_source").val().match(/pixiv\.net/)) {
+        Danbooru.RelatedTag.auto_artist_find = true;
         $("#find-artist-button").trigger("click");
       }
     }
-    $("#find-artist-button").click(Danbooru.RelatedTag.find_artist);
   }
   
   Danbooru.RelatedTag.common_bind = function(button_name, category) {
@@ -207,9 +208,10 @@
       }
       var $div = $("<div/>").addClass("artist");
       var $ul = $("<ul/>");
+      var $link = null;
       $ul.append(
         $("<li/>").append("Artist: ").append(
-          $("<a/>").attr("href", "/artists/" + json.id).html(json.name).click(Danbooru.RelatedTag.toggle_tag)
+          $link = $("<a/>").attr("href", "/artists/" + json.id).html(json.name).click(Danbooru.RelatedTag.toggle_tag)
         )
       );
       if (json.other_names.length > 0) {
@@ -220,6 +222,7 @@
       });
       $div.append($ul);
       $dest.append($div);
+      $link.trigger("click");
     });
   }
 })();
diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index e55f56fd7..04c077d69 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -10,7 +10,9 @@
       this.initialize_image();
       this.initialize_info();
       this.initialize_similar();
-      $("#related-tags-button").trigger("click");
+      if (!Danbooru.RelatedTag.auto_artist_find) {
+        $("#related-tags-button").trigger("click");
+      }
     }
   }