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

Convert tag category Javascript/CSS assets to ERB

Browse Source
This commit is contained in:
BrokenEagle
2017-12-24 11:01:17 -08:00
parent b48d5e59ad
commit d54b26c61d
9 changed files with 48 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/autocomplete.js → app/assets/javascripts/autocomplete.js.erb
View File

@@ -9,7 +9,6 @@
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();
@@ -95,7 +94,7 @@
var $fields_multiple = $('[data-autocomplete="tag-query"], [data-autocomplete="tag-edit"]');
var $fields_single = $('[data-autocomplete="tag"]');
var prefixes = "-|~|" + $.map(JSON.parse(Danbooru.meta("tag-category-names")), function (category) { return category + ':'}).join('|');
var prefixes = "-|~|" + "<%= TagCategory.mapping.keys.map {|category| 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";
@@ -329,7 +328,7 @@
"tagcount", "tagcount_asc",
"rank",
"random"
],
].concat(<%= TagCategory.short_name_list.map {|category| [category + "tags", category + "tags_asc"]}.flatten %>),
status: [
"any", "deleted", "active", "pending", "flagged", "banned"
],
@@ -347,11 +346,6 @@
],
}
//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];

12
app/assets/javascripts/related_tag.js → app/assets/javascripts/related_tag.js.erb
View File

@@ -12,15 +12,9 @@
Danbooru.RelatedTag.initialize_buttons = function() {
this.common_bind("#related-tags-button", "");
var related_buttons;
try {
related_buttons = JSON.parse(Danbooru.meta("related-tag-button-list"));
} catch (e) {
related_buttons = [];
}
$.each(related_buttons, function(i,category) {
Danbooru.RelatedTag.common_bind("#related-" + category + "-button", category);
});
<% TagCategory.related_button_list.each do |category| %>
Danbooru.RelatedTag.common_bind("#related-<%= category %>-button", "<%= category %>");
<% end %>
$("#find-artist-button").click(Danbooru.RelatedTag.find_artist);
}