From d7ec28b804e0fb239d881aa5faf37ca1ee67f522 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 14 Aug 2018 12:48:13 -0500 Subject: [PATCH 01/12] posts/show: fix 'Hide from queue' option in sidebar. Fix 'Hide from queue' option appearing on deleted posts, but not on pending or flagged posts. --- .../src/javascripts/post_moderation.js | 29 ------------------- .../posts/partials/show/_options.html.erb | 3 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 app/javascript/src/javascripts/post_moderation.js 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/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index d2230acc5..70696f05f 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -39,9 +39,8 @@
  • <%= link_to "Delete", confirm_delete_moderator_post_post_path(:post_id => post.id) %>
  • <% end %> - <% if post.is_flagged? || post.is_pending? %> + <% if post.is_approvable? && !post.is_deleted? %>
  • <%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve", :"data-shortcut" => "shift+o", :"data-confirm" => "Are you sure you want to approve this post?" %>
  • - <% else %>
  • <%= link_to "Hide from queue", moderator_post_disapproval_path(post_disapproval: { post_id: post.id, reason: "disinterest" }), remote: true, method: :post, id: "disapprove" %>
  • <% end %> From 7028417bfbf7b641dc6c9c81c811842a4ad9efb4 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 13 Aug 2018 01:50:52 -0500 Subject: [PATCH 02/12] posts/show: fix 'Flag' option in sidebar. * Don't show 'Flag' option on already flagged posts. * Drop flag/appeal link show/hide Javascript (did nothing, links were already shown/hidden in html). --- app/javascript/src/javascripts/post_appeals.js | 9 --------- app/javascript/src/javascripts/post_flags.js | 9 --------- app/views/posts/partials/show/_options.html.erb | 6 ++---- 3 files changed, 2 insertions(+), 22 deletions(-) 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/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index 70696f05f..1a646b189 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -21,11 +21,9 @@ <% if post.is_status_locked? %>
  • Status locked
  • <% else %> - <% if !post.is_deleted? && !post.is_pending? %> + <% if !post.is_deleted? && !post.is_pending? && !post.is_flagged? %>
  • <%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %>
  • - <% end %> - - <% if post.is_flagged? || post.is_deleted? %> + <% elsif post.is_flagged? || post.is_deleted? %>
  • <%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %>
  • <% end %> From 72a37c2f9449a07a32d8c11c04d3651403e866b5 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 13 Aug 2018 02:35:24 -0500 Subject: [PATCH 03/12] posts/show: fix flickering fav/unfav buttons. --- app/javascript/src/javascripts/favorites.js | 28 ------------------- .../posts/partials/show/_options.html.erb | 4 +-- app/views/posts/show.html.erb | 10 ++++--- 3 files changed, 8 insertions(+), 34 deletions(-) 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/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index 1a646b189..59545f93b 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -2,8 +2,8 @@
  • <%= link_to "Resize to window", "#", :id => "image-resize-to-window-link" %>
  • <% if CurrentUser.is_member? %> -
  • <%= link_to "Favorite", favorites_path(:post_id => post.id), :remote => true, :method => :post, :id => "add-to-favorites", :"data-shortcut" => "f" %>
  • -
  • <%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites", :"data-shortcut" => "shift+f" %>
  • +
  • <%= link_to "Favorite", favorites_path(:post_id => post.id), :remote => true, :method => :post, :id => "add-to-favorites", :"data-shortcut" => "f", style: ("display: none;" if @post.is_favorited?) %>
  • +
  • <%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites", :"data-shortcut" => "shift+f", style: ("display: none;" if !@post.is_favorited?) %>
  • <%= link_to_if post.visible?, "Download", post.tagged_file_url + "?download=1", download: post.presenter.filename_for_download %>
  • <%= link_to "Add to pool", "#", :id => "pool" %>
  • <% if post.is_note_locked? %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index b6c02c7c8..d7576b106 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -48,10 +48,12 @@ <%= @post.presenter.image_html(self) %> -
    - <%= button_to "Favorite", favorites_path(post_id: @post.id), remote: true, method: :post, form: {id: "add-fav-button"}, class: "ui-button ui-widget ui-corner-all gradient", data: {disable_with: "Favoriting..."} %> - <%= button_to "Unfavorite", favorite_path(@post), remote: true, method: :delete, form: {id: "remove-fav-button"}, class: "ui-button ui-widget ui-corner-all gradient", data: {disable_with: "Unfavoriting..."} %> -
    + <% if CurrentUser.is_member? %> +
    + <%= button_to "Favorite", favorites_path(post_id: @post.id), remote: true, method: :post, form: {id: "add-fav-button", style: ("display: none;" if @post.is_favorited?)}, class: "ui-button ui-widget ui-corner-all gradient", data: {disable_with: "Favoriting..."} %> + <%= button_to "Unfavorite", favorite_path(@post), remote: true, method: :delete, form: {id: "remove-fav-button", style: ("display: none;" if !@post.is_favorited?)}, class: "ui-button ui-widget ui-corner-all gradient", data: {disable_with: "Unfavoriting..."} %> +
    + <% end %> diff --git a/app/views/posts/partials/index/_blacklist.html.erb b/app/views/posts/partials/index/_blacklist.html.erb index 1ad6fdeaa..979d49849 100644 --- a/app/views/posts/partials/index/_blacklist.html.erb +++ b/app/views/posts/partials/index/_blacklist.html.erb @@ -1,4 +1,4 @@ -