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

fixes #813

Browse Source
This commit is contained in:
r888888888
2013-06-10 16:33:26 -07:00
parent 2f2c892670
commit af25507480
7 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,13 +105,9 @@
var $dest = $("#related-tags");
$dest.empty();
if (Danbooru.Cookie.get("recent_tags")) {
$dest.append(Danbooru.RelatedTag.build_html("recent", Danbooru.RelatedTag.recent_tags()));
}
if (Danbooru.RelatedTag.favorite_tags().length) {
$dest.append(Danbooru.RelatedTag.build_html("frequent", Danbooru.RelatedTag.favorite_tags()));
}
$dest.append(Danbooru.RelatedTag.build_html(query, related_tags));
$dest.append(this.build_html("recent", this.other_tags(Danbooru.Cookie.get("recent_tags"))));
$dest.append(this.build_html("frequent", this.other_tags(Danbooru.meta("favorite-tags"))));
$dest.append(this.build_html(query, related_tags));
if (wiki_page_tags.length) {
$dest.append(Danbooru.RelatedTag.build_html("wiki:" + query, wiki_page_tags));
}
@@ -138,22 +134,11 @@
}
}
Danbooru.RelatedTag.favorite_tags = function() {
var string = Danbooru.meta("favorite-tags");
if (string) {
return $.map(string.match(/\S+/g), function(x, i) {
return [[x, 0]];
});
} else {
return [];
}
}
Danbooru.RelatedTag.recent_tags = function() {
var string = Danbooru.Cookie.get("recent_tags");
Danbooru.RelatedTag.other_tags = function(string) {
if (string && string.length) {
return $.map(string.match(/\S+/g), function(x, i) {
return [[x, 0]];
return $.map(string.match(/\S+ \d+/g), function(x, i) {
var submatch = x.match(/(\S+) (\d+)/);
return [[submatch[1], submatch[2]]];
});
} else {
return [];