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

Moved tag logic for Javascript to config file

Browse Source
This commit is contained in:
BrokenEagle
2017-11-06 14:43:06 -08:00
parent 1e5540f3a0
commit 1de8fd2bd6
7 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/autocomplete.js
View File

@@ -9,6 +9,7 @@
Danbooru.Autocomplete.initialize_all = function() {
if (Danbooru.meta("enable-auto-complete") === "true") {
Danbooru.Autocomplete.enable_local_storage = this.test_local_storage();
this.update_static_metatags();
this.initialize_tag_autocomplete();
this.initialize_mention_autocomplete();
this.prune_local_storage();
@@ -94,7 +95,7 @@
var $fields_multiple = $('[data-autocomplete="tag-query"], [data-autocomplete="tag-edit"]');
var $fields_single = $('[data-autocomplete="tag"]');
var prefixes = "-|~|general:|gen:|artist:|art:|copyright:|copy:|co:|character:|char:|ch:";
var prefixes = "-|~|" + $.map(JSON.parse(Danbooru.meta("tag-category-names")), function (category) { return category + ':'}).join('|');
var metatags = "order|-status|status|-rating|rating|-locked|locked|child|filetype|-filetype|" +
"-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-fav|fav|ordfav|" +
"-pool|pool|ordpool|favgroup|-search|search";
@@ -326,10 +327,6 @@
"portrait", "landscape",
"filesize", "filesize_asc",
"tagcount", "tagcount_asc",
"gentags", "gentags_asc",
"arttags", "arttags_asc",
"chartags", "chartags_asc",
"copytags", "copytags_asc",
"rank",
"random"
],
@@ -350,6 +347,11 @@
],
}
//This must be done as a separate function as Danbooru.meta does not exist at program initialization
Danbooru.Autocomplete.update_static_metatags = function () {
Array.prototype.push.apply(Danbooru.Autocomplete.static_metatags.order,$.map(JSON.parse(Danbooru.meta("short-tag-category-names")), function(shorttag) { return [shorttag + "tags", shorttag + "tags_asc"]}));
}
Danbooru.Autocomplete.static_metatag_source = function(term, resp, metatag) {
var sub_metatags = this.static_metatags[metatag];

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

@@ -12,10 +12,9 @@
Danbooru.RelatedTag.initialize_buttons = function() {
this.common_bind("#related-tags-button", "");
this.common_bind("#related-general-button", "general");
this.common_bind("#related-artists-button", "artist");
this.common_bind("#related-characters-button", "character");
this.common_bind("#related-copyrights-button", "copyright");
$.each(JSON.parse(Danbooru.meta("related-tag-button-list")), function(i,category) {
Danbooru.RelatedTag.common_bind("#related-" + category + "-button", category);
});
$("#find-artist-button").click(Danbooru.RelatedTag.find_artist);
}