From 7b522f09c1269794a571b6c5a9fe5a4fef004e27 Mon Sep 17 00:00:00 2001 From: Toks Date: Tue, 23 Jul 2013 22:50:16 -0400 Subject: [PATCH] #1875: Update reltags * Hide reltags by default when opening dialog * Swap link arrows * Display reltags when clicking a button --- app/assets/javascripts/posts.js | 6 +++--- app/assets/javascripts/related_tag.js | 8 ++++---- app/views/posts/partials/show/_edit.html.erb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index abe319124..b1e673856 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -42,11 +42,11 @@ $("#toggle-related-tags-link").click(function(e) { if ($("#related-tags").is(":visible")) { $("#related-tags").hide(); - $(e.target).html("«"); + $(e.target).html("»"); } else { $("#related-tags").show(); Danbooru.RelatedTag.build_all(); - $(e.target).html("»"); + $(e.target).html("«"); } e.preventDefault(); }); @@ -56,7 +56,7 @@ $("div.input:has(#post_tag_string)").prevAll().hide(); $("#open-post-edit-dialog").hide(); - $("#toggle-related-tags-link").show(); + $("#toggle-related-tags-link").show().click(); $("#post_tag_string").css({"resize": "none", "width": "100%"}); diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js index df28395f3..a70834ec9 100644 --- a/app/assets/javascripts/related_tag.js +++ b/app/assets/javascripts/related_tag.js @@ -7,7 +7,9 @@ $("#related-tags-container").hide(); $("#artist-tags-container").hide(); $("#upload_tag_string,#post_tag_string").keyup(function(e) { - Danbooru.RelatedTag.build_all(); + if ($("#related-tags").is(":visible")) { + Danbooru.RelatedTag.build_all(); + } }); } } @@ -102,11 +104,9 @@ if (Danbooru.RelatedTag.recent_search === null || Danbooru.RelatedTag.recent_search === undefined) { return; } - if ($("#post-edit-dialog").length && !$("#related-tags").is(":visible")) { - return; - } $("#related-tags").show(); + $("#toggle-related-tags-link").html("«"); var query = Danbooru.RelatedTag.recent_search.query; var related_tags = Danbooru.RelatedTag.recent_search.tags; diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index d74c0a46f..05710ccac 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -77,7 +77,7 @@