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

remove flag/appeal/pool element text flash on post/show

Browse Source
This commit is contained in:
albert
2013-03-08 13:17:47 -05:00
parent 147efb74d3
commit 80f3bb5e47
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
Danbooru.PostAppeal = {}; Danbooru.PostAppeal = {};
Danbooru.PostAppeal.initialize_all = function() { Danbooru.PostAppeal.initialize_all = function() {
if ($("#c-posts") && $("#a-show")) { if ($("#c-posts").length && $("#a-show").length) {
this.initialize_appeal(); this.initialize_appeal();
this.hide_or_show_appeal_link(); this.hide_or_show_appeal_link();
} }

8
app/assets/javascripts/post_flags.js
View File

@@ -2,14 +2,14 @@
Danbooru.PostFlag = {}; Danbooru.PostFlag = {};
Danbooru.PostFlag.initialize_all = function() { Danbooru.PostFlag.initialize_all = function() {
if ($("#c-posts") && $("#a-show")) { if ($("#c-posts").length && $("#a-show").length) {
this.initialize_flag(); this.initialize_flag();
this.hide_or_show_flag_link(); this.hide_or_show_flag_link();
} }
} }
Danbooru.PostFlag.hide_or_show_flag_link = function() { Danbooru.PostFlag.hide_or_show_flag_link = function() {
if (Danbooru.meta("post-is-deleted") == "true") { if (Danbooru.meta("post-is-deleted") === "true") {
$("#flag").hide(); $("#flag").hide();
} }
} }
@@ -41,6 +41,6 @@
} }
})(); })();
$(document).ready(function() { $(function() {
Danbooru.PostFlag.initialize_all(); Danbooru.PostFlag.initialize_all();
}); });

2
app/views/pool_elements/_new.html.erb
View File

@@ -10,7 +10,7 @@
</div> </div>
<div class="input"> <div class="input">
<%= submit_tag "Select" %> <%= submit_tag "Submit" %>
</div> </div>
<% end %> <% end %>

6
app/views/posts/show.html.erb
View File

@@ -73,15 +73,15 @@
</section> </section>
</div> </div>
<div id="flag-dialog" title="Flag post"> <div id="flag-dialog" title="Flag post" style="display: none;">
<%= render "post_flags/new" %> <%= render "post_flags/new" %>
</div> </div>
<div id="appeal-dialog" title="Appeal post"> <div id="appeal-dialog" title="Appeal post" style="display: none;">
<%= render "post_appeals/new" %> <%= render "post_appeals/new" %>
</div> </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" %> <%= render "pool_elements/new" %>
</div> </div>
</div> </div>

1
config/deploy.rb
View File

@@ -138,6 +138,7 @@ after "deploy:start", "delayed_job:start"
after "deploy:stop", "delayed_job:stop" after "deploy:stop", "delayed_job:stop"
after "deploy:restart", "delayed_job:restart" after "deploy:restart", "delayed_job:restart"
before "deploy:update", "deploy:web:disable" before "deploy:update", "deploy:web:disable"
after "deploy:update", "deploy:migrate"
after "deploy:update", "deploy:restart" after "deploy:update", "deploy:restart"
after "deploy:restart", "deploy:precompile_assets" after "deploy:restart", "deploy:precompile_assets"
after "deploy:restart", "deploy:web:enable" after "deploy:restart", "deploy:web:enable"