From 73cce49fb0b6127a2016a355b64c47a8636dafcb Mon Sep 17 00:00:00 2001 From: albert Date: Thu, 21 Feb 2013 14:01:43 -0500 Subject: [PATCH] add favorite tags to reltag js --- app/assets/javascripts/related_tag.js | 9 ++++++++- app/logical/anonymous_user.rb | 4 ++++ app/views/posts/show.html.erb | 1 + app/views/uploads/new.html.erb | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js index 26f8671f2..7a7fd9983 100644 --- a/app/assets/javascripts/related_tag.js +++ b/app/assets/javascripts/related_tag.js @@ -88,12 +88,19 @@ var $dest = $("#related-tags"); $dest.empty(); + if (Danbooru.RelatedTag.favorite_tags().length) { + $dest.append(Danbooru.RelatedTag.build_html("favorite", Danbooru.RelatedTag.favorite_tags())); + } $dest.append(Danbooru.RelatedTag.build_html(query, related_tags)); - if (wiki_page_tags.length > 0) { + if (wiki_page_tags.length) { $dest.append(Danbooru.RelatedTag.build_html("wiki:" + query, wiki_page_tags)); } } + Danbooru.RelatedTag.favorite_tags = function() { + return Danbooru.meta("favorite-tags").match(/\S+/g); + } + Danbooru.RelatedTag.build_html = function(query, related_tags) { if (query === null || query === "") { return ""; diff --git a/app/logical/anonymous_user.rb b/app/logical/anonymous_user.rb index 352fccf05..c490867f6 100644 --- a/app/logical/anonymous_user.rb +++ b/app/logical/anonymous_user.rb @@ -60,6 +60,10 @@ class AnonymousUser [] end + def favorite_tags + nil + end + def upload_limit 0 end diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 21b0d9742..7b53e6085 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -99,6 +99,7 @@ + diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index a8587b638..262ba41a9 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -72,4 +72,8 @@ Upload - <%= Danbooru.config.app_name %> <% end %> +<% content_for(:html_header) do %> + +<% end %> + <%= render "posts/partials/common/secondary_links" %>