diff --git a/app/javascript/src/javascripts/artist_commentaries.js b/app/javascript/src/javascripts/artist_commentaries.js index 70f20af86..06f99fc70 100644 --- a/app/javascript/src/javascripts/artist_commentaries.js +++ b/app/javascript/src/javascripts/artist_commentaries.js @@ -26,9 +26,6 @@ ArtistCommentary.initialize_commentary_display_tabs = function() { $(e.target).parent("li").addClass("active"); e.preventDefault(); }); - - $("#commentary-sections li:last-child").addClass("active"); - $("#original-artist-commentary").hide(); } ArtistCommentary.initialize_edit_commentary_dialog = function() { diff --git a/app/javascript/src/javascripts/blacklists.js b/app/javascript/src/javascripts/blacklists.js index 9fbd08727..2c8fcd509 100644 --- a/app/javascript/src/javascripts/blacklists.js +++ b/app/javascript/src/javascripts/blacklists.js @@ -186,8 +186,6 @@ Blacklist.initialize_all = function() { if (Blacklist.apply() > 0) { Blacklist.update_sidebar(); Blacklist.initialize_disable_all_blacklists(); - } else { - $("#blacklist-box").hide(); } } diff --git a/app/javascript/src/javascripts/dtext.js b/app/javascript/src/javascripts/dtext.js index 807bcf064..e990c1758 100644 --- a/app/javascript/src/javascripts/dtext.js +++ b/app/javascript/src/javascripts/dtext.js @@ -6,13 +6,11 @@ Dtext.initialize_all = function() { } Dtext.initialize_links = function() { - $(".simple_form .dtext-preview").hide(); $(".simple_form input[value=Preview]").click(Dtext.click_button); } Dtext.initialize_expandables = function($parent) { $parent = $parent || $(document); - $parent.find(".expandable-content").hide(); $parent.find(".expandable-button").click(function(e) { var button = $(this); button.parent().next().fadeToggle("fast"); diff --git a/app/javascript/src/javascripts/favorites.js b/app/javascript/src/javascripts/favorites.js index ef6d2d44a..17b563566 100644 --- a/app/javascript/src/javascripts/favorites.js +++ b/app/javascript/src/javascripts/favorites.js @@ -3,30 +3,6 @@ import Utility from './utility' let Favorite = {} -Favorite.initialize_all = function() { - if ($("#c-posts").length) { - this.hide_or_show_add_to_favorites_link(); - } -} - -Favorite.hide_or_show_add_to_favorites_link = function() { - var current_user_id = Utility.meta("current-user-id"); - if (current_user_id === "") { - $("#add-to-favorites").hide(); - $("#remove-from-favorites").hide(); - $("#add-fav-button").hide(); - $("#remove-fav-button").hide(); - return; - } - if ($("#image-container").length && $("#image-container").data("is-favorited") === true) { - $("#add-to-favorites").hide(); - $("#add-fav-button").hide(); - } else { - $("#remove-from-favorites").hide(); - $("#remove-fav-button").hide(); - } -} - Favorite.create = function(post_id) { Post.notice_update("inc"); @@ -57,9 +33,5 @@ Favorite.destroy = function(post_id) { }); } -$(document).ready(function() { - Favorite.initialize_all(); -}); - export default Favorite diff --git a/app/javascript/src/javascripts/forum_posts.js b/app/javascript/src/javascripts/forum_posts.js index d63d11f98..dce3ef8c0 100644 --- a/app/javascript/src/javascripts/forum_posts.js +++ b/app/javascript/src/javascripts/forum_posts.js @@ -7,8 +7,6 @@ ForumPost.initialize_all = function() { } ForumPost.initialize_edit_links = function() { - $(".edit_forum_post, .edit_forum_topic").hide(); - $(".edit_forum_post_link").click(function(e) { var link_id = $(this).attr("id"); var forum_post_id = link_id.match(/^edit_forum_post_link_(\d+)$/)[1]; diff --git a/app/javascript/src/javascripts/post_appeals.js b/app/javascript/src/javascripts/post_appeals.js index 31dbd0c54..0e5134ab6 100644 --- a/app/javascript/src/javascripts/post_appeals.js +++ b/app/javascript/src/javascripts/post_appeals.js @@ -1,17 +1,8 @@ -import Utility from './utility' - let PostAppeal = {}; PostAppeal.initialize_all = function() { if ($("#c-posts").length && $("#a-show").length) { this.initialize_appeal(); - this.hide_or_show_appeal_link(); - } -} - -PostAppeal.hide_or_show_appeal_link = function() { - if ((Utility.meta("post-is-flagged") === "false") && (Utility.meta("post-is-deleted") === "false")) { - $("#appeal").hide(); } } diff --git a/app/javascript/src/javascripts/post_flags.js b/app/javascript/src/javascripts/post_flags.js index f85aa806e..3dbd8e361 100644 --- a/app/javascript/src/javascripts/post_flags.js +++ b/app/javascript/src/javascripts/post_flags.js @@ -1,17 +1,8 @@ -import Utility from './utility' - let PostFlag = {}; PostFlag.initialize_all = function() { if ($("#c-posts").length && $("#a-show").length) { this.initialize_flag(); - this.hide_or_show_flag_link(); - } -} - -PostFlag.hide_or_show_flag_link = function() { - if (Utility.meta("post-is-deleted") === "true") { - $("#flag").hide(); } } diff --git a/app/javascript/src/javascripts/post_moderation.js b/app/javascript/src/javascripts/post_moderation.js deleted file mode 100644 index aa4782179..000000000 --- a/app/javascript/src/javascripts/post_moderation.js +++ /dev/null @@ -1,29 +0,0 @@ -import Utility from './utility' - -let PostModeration = {}; - -PostModeration.initialize_all = function() { - if ($("#c-posts").length && $("#a-show").length) { - this.hide_or_show_approve_and_disapprove_links(); - this.hide_or_show_delete_and_undelete_links(); - } -} - -PostModeration.hide_or_show_approve_and_disapprove_links = function() { - if (Utility.meta("post-is-approvable") !== "true") { - $("#approve").hide(); - $("#disapprove").hide(); - } -} - -PostModeration.hide_or_show_delete_and_undelete_links = function() { - if (Utility.meta("post-is-deleted") === "true") { - $("#delete").hide(); - } else { - $("#undelete").hide(); - } -} - -$(document).ready(function() { - PostModeration.initialize_all(); -}); diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index 3af058b8b..6972ab4ed 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -273,8 +273,6 @@ Post.initialize_links = function() { e.preventDefault(); }); - - $(".unvote-post-link").hide(); } Post.initialize_post_relationship_previews = function() { @@ -309,24 +307,8 @@ Post.toggle_relationship_preview = function(preview, preview_link) { } Post.initialize_favlist = function() { - $("#favlist").hide(); - $("#hide-favlist-link").hide(); - var fav_count = $("#show-favlist-link").prev().text(); - if (fav_count === "0") { - $("#show-favlist-link").hide(); - } - - $("#show-favlist-link").click(function(e) { - $("#favlist").show(); - $(this).hide(); - $("#hide-favlist-link").show(); - e.preventDefault(); - }); - - $("#hide-favlist-link").click(function(e) { - $("#favlist").hide(); - $(this).hide(); - $("#show-favlist-link").show(); + $("#show-favlist-link, #hide-favlist-link").click(function(e) { + $("#favlist, #show-favlist-link, #hide-favlist-link").toggle(); e.preventDefault(); }); } @@ -481,11 +463,6 @@ Post.initialize_post_sections = function() { $(e.target).parent("li").addClass("active"); e.preventDefault(); }); - - $("#notes").hide(); - $("#edit").hide(); - $("#recommended").hide(); - $("#post-sections li:first-child").addClass("active"); } Post.resize_ugoira_controls = function() { diff --git a/app/javascript/src/styles/common/dtext.scss b/app/javascript/src/styles/common/dtext.scss index 2910d3fbf..6ed676cd8 100644 --- a/app/javascript/src/styles/common/dtext.scss +++ b/app/javascript/src/styles/common/dtext.scss @@ -79,6 +79,7 @@ div.prose { } div.expandable-content { + display: none; padding: 0.4em; border-top: 1px solid #666; @@ -89,6 +90,8 @@ div.prose { } div.dtext-preview { + display: none; + ul { margin-left: 1em; } diff --git a/app/javascript/src/styles/specific/forum.scss b/app/javascript/src/styles/specific/forum.scss index 0d8990a0b..e993cca13 100644 --- a/app/javascript/src/styles/specific/forum.scss +++ b/app/javascript/src/styles/specific/forum.scss @@ -43,6 +43,10 @@ div.list-of-forum-posts { padding: 1em; margin-left: 14em; + .edit_forum_post, .edit_forum_topic { + display: none; + } + menu { margin-top: 0.5em; diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index 80c636aeb..cb905cb0e 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -499,10 +499,12 @@ div#c-explore-posts { } } -.inline-blacklist { - #blacklist-box { - margin-bottom: 1em; - } +#blacklist-box { + display: none; +} + +#blacklist-box.inline-blacklist { + margin-bottom: 1em; #blacklist-list { display: inline; diff --git a/app/views/artist_commentaries/_show.html.erb b/app/views/artist_commentaries/_show.html.erb index 183bd9f60..7dbe40d2c 100644 --- a/app/views/artist_commentaries/_show.html.erb +++ b/app/views/artist_commentaries/_show.html.erb @@ -3,7 +3,7 @@
<% if artist_commentary.original_present? %> -