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

merge translated tags branch

Browse Source
This commit is contained in:
Toks
2014-05-29 23:11:34 -04:00
parent 3f61415388 aebeffb888
commit eb81f06eb2
15 changed files with 109 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/related_tag.js
View File

@@ -125,6 +125,7 @@
this.build_recent_and_frequent($dest);
$dest.append(this.build_html(query, related_tags, "general"));
this.build_translated($dest);
if (wiki_page_tags.length) {
$dest.append(Danbooru.RelatedTag.build_html("wiki:" + query, wiki_page_tags, "wiki"));
}
@@ -173,6 +174,12 @@
}
}
Danbooru.RelatedTag.build_translated = function($dest) {
if (Danbooru.RelatedTag.translated_tags && Danbooru.RelatedTag.translated_tags.length) {
$dest.append(this.build_html("translated", Danbooru.RelatedTag.translated_tags, "translated"));
}
}
Danbooru.RelatedTag.build_html = function(query, related_tags, name, is_wide_column) {
if (query === null || query === "") {
return "";

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

@@ -85,6 +85,9 @@
$("#source-artist").html('<a href="' + data.profile_url + '">' + data.artist_name + '</a>');
$("#source-tags").html(tag_html);
Danbooru.RelatedTag.translated_tags = data.translated_tags;
Danbooru.RelatedTag.build_all();
var new_artist_link = '<a target="_blank" href="/artists/new?name=' + data.unique_id + '&other_names=' + data.artist_name + '&urls=' + encodeURIComponent(data.profile_url) + '+' + encodeURIComponent(data.image_url) + '">new</a>';