Fix metatags being treated as normal tags

- Add parent metatag defaults any and none
- Add missing user-based metatags to user source
- Remove all negative metatags since the prior code strips the '-'
This commit is contained in:
BrokenEagle
2018-01-02 18:53:51 -08:00
parent c3aff42458
commit 8f0e4398eb

View File

@@ -95,9 +95,7 @@
var $fields_single = $('[data-autocomplete="tag"]'); var $fields_single = $('[data-autocomplete="tag"]');
var prefixes = "-|~|" + "<%= TagCategory.mapping.keys.map {|category| category + ':'}.join('|') %>"; var prefixes = "-|~|" + "<%= TagCategory.mapping.keys.map {|category| category + ':'}.join('|') %>";
var metatags = "order|-status|status|-rating|rating|-locked|locked|child|filetype|-filetype|" + var metatags = "<%= Tag::METATAGS %>";
"-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-fav|fav|ordfav|" +
"-pool|pool|ordpool|favgroup|-search|search";
$fields_multiple.autocomplete({ $fields_multiple.autocomplete({
delay: 100, delay: 100,
@@ -150,16 +148,34 @@
} }
switch(metatag) { switch(metatag) {
case "md5":
case "width":
case "height":
case "mpixels":
case "ratio":
case "score":
case "favcount":
case "filesize":
case "source":
case "id":
case "date":
case "age":
case "limit":
case "tagcount":
case "pixiv_id":
case "pixiv":
<% TagCategory.short_name_list.each do |category| %>
case "<%= category %>tags":
<% end %>
return;
case "order": case "order":
case "status": case "status":
case "-status":
case "rating": case "rating":
case "-rating":
case "locked": case "locked":
case "-locked":
case "child": case "child":
case "parent":
case "filetype": case "filetype":
case "-filetype":
Danbooru.Autocomplete.static_metatag_source(term, resp, metatag); Danbooru.Autocomplete.static_metatag_source(term, resp, metatag);
return; return;
} }
@@ -170,30 +186,28 @@
switch(metatag) { switch(metatag) {
case "user": case "user":
case "-user":
case "approver": case "approver":
case "-approver":
case "commenter": case "commenter":
case "comm": case "comm":
case "noter": case "noter":
case "noteupdater": case "noteupdater":
case "artcomm": case "artcomm":
case "fav": case "fav":
case "-fav":
case "ordfav": case "ordfav":
case "appealer":
case "flagger":
case "upvote":
case "downvote":
Danbooru.Autocomplete.user_source(term, resp, metatag); Danbooru.Autocomplete.user_source(term, resp, metatag);
break; break;
case "pool": case "pool":
case "-pool":
case "ordpool": case "ordpool":
Danbooru.Autocomplete.pool_source(term, resp, metatag); Danbooru.Autocomplete.pool_source(term, resp, metatag);
break; break;
case "favgroup": case "favgroup":
case "-favgroup":
Danbooru.Autocomplete.favorite_group_source(term, resp, metatag); Danbooru.Autocomplete.favorite_group_source(term, resp, metatag);
break; break;
case "search": case "search":
case "-search":
Danbooru.Autocomplete.saved_search_source(term, resp); Danbooru.Autocomplete.saved_search_source(term, resp);
break; break;
default: default:
@@ -341,6 +355,9 @@
child: [ child: [
"any", "none" "any", "none"
], ],
parent: [
"any", "none"
],
filetype: [ filetype: [
"jpg", "png", "gif", "swf", "zip", "webm", "mp4" "jpg", "png", "gif", "swf", "zip", "webm", "mp4"
], ],