js: clean up notice/error messaging.

app/views/bulk_update_requests/approve.js.erb

@@ -1,5 +1,5 @@
 <% if @bulk_update_request.errors.any? %>
-  $(window).trigger("danbooru:error", <%= j @bulk_update_request.errors.full_messages.join(',') %>);
+  Danbooru.error(<%= j @bulk_update_request.errors.full_messages.join(',') %>);
 <% else %>
   if ($("#a-index").length) {
     $("#request-status-for-<%= @bulk_update_request.id %>").html("queued");

app/views/comment_votes/create.js.erb

@@ -1,7 +1,7 @@
 <% if @error %>
-  $(window).trigger("danbooru:error", "<%= j @error.to_s %>");
+  Danbooru.error("<%= j @error.to_s %>");
 <% elsif @comment_vote.errors.any? %>
-  $(window).trigger("danbooru:error", "<%= j @comment_vote.errors.full_messages.join('; ') %>");
+  Danbooru.error("<%= j @comment_vote.errors.full_messages.join('; ') %>");
 <% elsif @comment_vote.is_negative? %>
   $(".comment[data-comment-id=<%= @comment.id %>]").remove();
 <% end %>

app/views/comment_votes/destroy.js.erb

@@ -1,5 +1,5 @@
 <% if @error %>
-  $(window).trigger("danbooru:error", "<%= j @error.to_s %>");
+  Danbooru.error("<%= j @error.to_s %>");
 <% else %>
   $("#comment-vote-up-link-for-<%= @comment.id %>").show();
   $("#comment-vote-down-link-for-<%= @comment.id %>").show();

app/views/dmails/ham.js.erb

@@ -1,2 +1,2 @@
-$(window).trigger("danbooru:notice", "Message marked as not spam");
-$("#spam-links").hide();
+Danbooru.notice("Message marked as not spam");
+$("#spam-links").hide();

app/views/dmails/spam.js.erb

@@ -1,2 +1,2 @@
-$(window).trigger("danbooru:notice", "Message marked as spam");
-$("#spam-links").hide();
+Danbooru.notice("Message marked as spam");
+$("#spam-links").hide();

app/views/favorite_groups/add_post.js.erb

@@ -1,2 +1,2 @@
-$(window).trigger("danbooru:notice", "Added post to favorite group <%= escape_javascript(@favorite_group.pretty_name) %>");
+Danbooru.notice("Added post to favorite group <%= escape_javascript(@favorite_group.pretty_name) %>");
 $("#add-to-favgroup-dialog").dialog("close");

app/views/forum_post_votes/create.js.erb

@@ -1,7 +1,7 @@
 <% if @forum_post_vote.invalid? %>
-$(window).trigger("danbooru:error", <%= raw @forum_post_vote.errors.full_messages.join("; ").to_json %>);
+  Danbooru.error(<%= raw @forum_post_vote.errors.full_messages.join("; ").to_json %>);
 <% else %>
-$(window).trigger("danbooru:notice", "Voted");
-var code = <%= raw render(partial: "forum_post_votes/list", locals: {forum_post: @forum_post, votes: @forum_post.votes}).to_json %>;
-$("#forum-post-votes-for-<%= @forum_post.id %>").html(code);
+  Danbooru.notice("Voted");
+  var code = <%= raw render(partial: "forum_post_votes/list", locals: {forum_post: @forum_post, votes: @forum_post.votes}).to_json %>;
+  $("#forum-post-votes-for-<%= @forum_post.id %>").html(code);
 <% end %>

app/views/forum_post_votes/destroy.js.erb

@@ -1,3 +1,3 @@
-$(window).trigger("danbooru:notice", "Unvoted");
+Danbooru.notice("Unvoted");
 var code = <%= raw render(partial: "forum_post_votes/list", locals: {forum_post: @forum_post, votes: @forum_post.votes}).to_json %>;
 $("#forum-post-votes-for-<%= @forum_post.id %>").html(code);

app/views/layouts/default.html.erb

@@ -78,14 +78,10 @@
     if (typeof window.Danbooru !== "object") {
       window.Danbooru = {};
     }
-    window.Danbooru.notice = function(msg) {
-      console.warn("Danbooru.notice will be deprecated. Use $(window).trigger('danbooru:notice', msg) instead.")
-      $(window).trigger("danbooru:notice", msg);
-    }
-    window.Danbooru.error = function(msg) {
-      console.warn("Danbooru.error will be deprecated. Use $(window).trigger('danbooru:error', msg) instead.")
-      $(window).trigger("danbooru:error", msg);
-    }
+
+    window.Danbooru.notice = Danbooru.Utility.notice;
+    window.Danbooru.error = Danbooru.Utility.error;
+
     window._paq = window._paq || [];
     <% if CurrentUser.is_member? && !CurrentUser.opt_out_tracking? %>
       window._paq.push(["setUserId", '<%= CurrentUser.id %>']);

app/views/maintenance/user/api_keys/update.js.erb

@@ -1,9 +1,9 @@
 <% if @api_key.errors.any? %>
-  $(window).trigger("danbooru:error", "<%= j @api_key.errors.full_messages.join(', ') %>");
+  Danbooru.error("<%= j @api_key.errors.full_messages.join(', ') %>");
 <% else %>
   $("#api-key").text("<%= j @api_key.key %>");
   $("#api-key-created").html("<%= j compact_time @api_key.created_at %>");
   $("#api-key-updated").html("<%= j compact_time @api_key.updated_at %>");
 
-  $(window).trigger("danbooru:notice", "API key regenerated.");
+  Danbooru.notice("API key regenerated.");
 <% end %>

app/views/moderator/post/approvals/create.js.erb

@@ -1,11 +1,11 @@
 <% if @approval.errors.any? %>
-  $(window).trigger("danbooru:error", "Error: " + <%= @approval.errors.full_messages.join("; ").to_json.html_safe %>);
+  Danbooru.error("Error: " + <%= @approval.errors.full_messages.join("; ").to_json.html_safe %>);
 <% else %>
   if ($("#c-posts #a-show").length) {
     location.reload();
   } else if ($("#c-moderator-post-queues").length) {
     $("#c-moderator-post-queues #post-<%= @approval.post.id %>").hide();
     $(window).trigger("danbooru:modqueue_increment_processed");
-    $(window).trigger("danbooru:notice", "Post was approved");
+    Danbooru.notice("Post was approved");
   }
 <% end %>

app/views/moderator/post/disapprovals/create.js.erb

@@ -1,11 +1,11 @@
 <% if @post_disapproval.errors.any? %>
-  $(window).trigger("danbooru:error", "Error: " + <%= @post_disapproval.errors.full_messages.join("; ").to_json.html_safe %>);
+  Danbooru.error("Error: " + <%= @post_disapproval.errors.full_messages.join("; ").to_json.html_safe %>);
 <% else %>
   if ($("#c-posts #a-show").length) {
     location.reload();
   } else if ($("#c-moderator-post-queues").length) {
     $("#c-moderator-post-queues #post-<%= @post_disapproval.post.id %>").hide();
     $(window).trigger("danbooru:modqueue_increment_processed");
-    $(window).trigger("danbooru:notice", "Post was hidden");
+    Danbooru.notice("Post was hidden");
   }
 <% end %>

app/views/moderator/post/posts/expunge.js.erb

@@ -1,7 +1,7 @@
 <% if @post.errors.any? %>
-  $(window).trigger("danbooru:error", "<%= j @post.errors.full_messages.join('; ') %>");
+  Danbooru.error("<%= j @post.errors.full_messages.join('; ') %>");
 <% elsif @error %>
-  $(window).trigger("danbooru:error", "<%= j @error.to_s %>");
+  Danbooru.error("<%= j @error.to_s %>");
 <% else %>
-  $(window).trigger("danbooru:notice", "Post was permanently deleted");
+  Danbooru.notice("Post was permanently deleted");
 <% end %>

app/views/moderator/post/posts/undelete.js.erb

@@ -1,3 +1,3 @@
 $("#c-posts #delete").show();
 $("#c-posts #undelete").hide();
-$(window).trigger("danbooru:notice", "Post was undeleted");
+Danbooru.notice("Post was undeleted");

app/views/pool_elements/create.js.erb

@@ -1,5 +1,5 @@
 <% if @error %>
-  $(window).trigger("danbooru:error", "<%= j @error.to_s %>");
+  Danbooru.error("<%= j @error.to_s %>");
 <% else %>
   location.reload();
 <% end %>

app/views/post_appeals/create.js.erb

@@ -1,6 +1,6 @@
 var errors = "<%= j @post_appeal.errors.full_messages.join("; ") %>";
 if (errors.length > 0) {
-  $(window).trigger("danbooru:error", errors);
+  Danbooru.error(errors);
 } else {
-  $(window).trigger("danbooru:notice", "Post appealed");
+  Danbooru.notice("Post appealed");
 }

app/views/post_flags/create.js.erb

@@ -1,8 +1,8 @@
 var errors = <%= @post_flag.errors.full_messages.to_json.html_safe %>;
 if (errors.length > 0) {
-  $(window).trigger("danbooru:error", errors.join("; "));
+  Danbooru.error(errors.join("; "));
 } else {
-  $(window).trigger("danbooru:notice", "Post flagged");
+  Danbooru.notice("Post flagged");
   $("a#approve").show();
   $("a#disapprove").show();
 }

app/views/saved_searches/create.js.erb

@@ -1,5 +1,5 @@
 <% if @saved_search.errors.any? %>
-  $(window).trigger("danbooru:error", "<%= j @saved_search.errors.full_messages.join(', ') %>");
+  Danbooru.error("<%= j @saved_search.errors.full_messages.join(', ') %>");
 <% else %>
-  $(window).trigger("danbooru:notice", "Search '<%= j @saved_search.query %>' was saved");
+  Danbooru.notice("Search '<%= j @saved_search.query %>' was saved");
 <% end %>

app/views/saved_searches/destroy.js.erb

@@ -1,4 +1,4 @@
-$(window).trigger("danbooru:notice", "Search '<%= j @saved_search.query %>' was deleted");
+Danbooru.notice("Search '<%= j @saved_search.query %>' was deleted");
 $("#saved-searches-nav").html("<%= j render('saved_searches/interface', :saved_searches => CurrentUser.user.saved_searches) %>");
 $(window).trigger("danbooru:initialize_saved_searches");
 $("#saved-search-<%= @saved_search.id %>").remove();