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

fixes

Browse Source
This commit is contained in:
albert
2013-02-17 02:45:22 -05:00
parent 992021de80
commit 30ac61d6c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
Danbooru.Blacklist.blacklists = []; Danbooru.Blacklist.blacklists = [];
Danbooru.Blacklist.parse_entries = function() { Danbooru.Blacklist.parse_entries = function() {
var entries = j(Danbooru.meta("blacklisted-tags") || "[]").replace(/(rating:[qes])\w+/, "$1").split(/,/); var entries = (Danbooru.meta("blacklisted-tags") || "[]").replace(/(rating:[qes])\w+/, "$1").split(/,/);
$.each(entries, function(i, tags) { $.each(entries, function(i, tags) {
var blacklist = { var blacklist = {
"tags": tags, "tags": tags,

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

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