From 80f3bb5e47af0ac74e3396ca3a136a649812ed78 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 8 Mar 2013 13:17:47 -0500
Subject: [PATCH] remove flag/appeal/pool element text flash on post/show

---
 app/assets/javascripts/post_appeals.js | 2 +-
 app/assets/javascripts/post_flags.js   | 8 ++++----
 app/views/pool_elements/_new.html.erb  | 2 +-
 app/views/posts/show.html.erb          | 6 +++---
 config/deploy.rb                       | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/post_appeals.js b/app/assets/javascripts/post_appeals.js
index 97f8b97f0..9ef0e8df4 100644
--- a/app/assets/javascripts/post_appeals.js
+++ b/app/assets/javascripts/post_appeals.js
@@ -2,7 +2,7 @@
   Danbooru.PostAppeal = {};
   
   Danbooru.PostAppeal.initialize_all = function() {
-    if ($("#c-posts") && $("#a-show")) {
+    if ($("#c-posts").length && $("#a-show").length) {
       this.initialize_appeal();
       this.hide_or_show_appeal_link();
     }
diff --git a/app/assets/javascripts/post_flags.js b/app/assets/javascripts/post_flags.js
index 9fa08e0ee..561d83a66 100644
--- a/app/assets/javascripts/post_flags.js
+++ b/app/assets/javascripts/post_flags.js
@@ -2,14 +2,14 @@
   Danbooru.PostFlag = {};
   
   Danbooru.PostFlag.initialize_all = function() {
-    if ($("#c-posts") && $("#a-show")) {
-     this.initialize_flag();
+    if ($("#c-posts").length && $("#a-show").length) {
+      this.initialize_flag();
       this.hide_or_show_flag_link();
     }
   }
   
   Danbooru.PostFlag.hide_or_show_flag_link = function() {
-    if (Danbooru.meta("post-is-deleted") == "true") {
+    if (Danbooru.meta("post-is-deleted") === "true") {
       $("#flag").hide();
     }
   }
@@ -41,6 +41,6 @@
   }
 })();
 
-$(document).ready(function() {
+$(function() {
   Danbooru.PostFlag.initialize_all();
 });
diff --git a/app/views/pool_elements/_new.html.erb b/app/views/pool_elements/_new.html.erb
index 14c93cfca..95db9333e 100644
--- a/app/views/pool_elements/_new.html.erb
+++ b/app/views/pool_elements/_new.html.erb
@@ -10,7 +10,7 @@
       </div>
       
       <div class="input">
-        <%= submit_tag "Select" %>
+        <%= submit_tag "Submit" %>
       </div>
     <% end %>
 
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 839d51b92..921097e95 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -73,15 +73,15 @@
     </section>
   </div>
 
-  <div id="flag-dialog" title="Flag post">
+  <div id="flag-dialog" title="Flag post" style="display: none;">
     <%= render "post_flags/new" %>
   </div>
 
-  <div id="appeal-dialog" title="Appeal post">
+  <div id="appeal-dialog" title="Appeal post" style="display: none;">
     <%= render "post_appeals/new" %>
   </div>
   
-  <div id="add-to-pool-dialog" title="Add to pool">
+  <div id="add-to-pool-dialog" title="Add to pool" style="display: none;">
     <%= render "pool_elements/new" %>
   </div>
 </div>
diff --git a/config/deploy.rb b/config/deploy.rb
index e71801dc2..ed7242da1 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -138,6 +138,7 @@ after "deploy:start", "delayed_job:start"
 after "deploy:stop", "delayed_job:stop"
 after "deploy:restart", "delayed_job:restart"
 before "deploy:update", "deploy:web:disable"
+after "deploy:update", "deploy:migrate"
 after "deploy:update", "deploy:restart"
 after "deploy:restart", "deploy:precompile_assets"
 after "deploy:restart", "deploy:web:enable"