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

blacklist js fixes

Browse Source
This commit is contained in:
albert
2013-02-28 13:03:51 -08:00
parent 609357ae9e
commit d089bc8464
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/blacklists.js
View File

@@ -98,7 +98,7 @@
tags.push("rating:" + $post.data("rating"));
tags.push("user:" + $post.data("user"));
return Danbooru.is_subset(tags, blacklist.require) && !Danbooru.intersect(tags, blacklist.exclude).length;
return (blacklist.require.length > 0 || blacklist.exclude.length > 0) && Danbooru.is_subset(tags, blacklist.require) && !Danbooru.intersect(tags, blacklist.exclude).length;
}
Danbooru.Blacklist.post_hide = function(post) {

2
app/assets/javascripts/utility.js
View File

@@ -13,7 +13,7 @@
Danbooru.is_subset = function(array, subarray) {
var all = true;
$.each(subarray, function(i, val) {
if ($.inArray(val, array) === -1) {
all = false;

2
app/views/layouts/default.html.erb
View File

@@ -9,7 +9,7 @@
<meta name="current-user-id" content="<%= CurrentUser.id %>">
<meta name="user-comment-threshold" content="<%= CurrentUser.comment_threshold %>">
<% unless CurrentUser.user.blacklisted_tags.blank? %>
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags.gsub(/\r\n|\r|\n/, ",") %>">
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags.gsub(/(?:\r|\n)+/, ",") %>">
<% end %>
<% if flash[:notice] =~ /error/ %>
<meta name="errors" content="true">