From d369d384190cb55da0cf959b0b4ad6e9205171b6 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 11 Aug 2018 16:36:25 -0500 Subject: [PATCH 1/2] shortcuts.js: Add declarative `data-shortcut` keyboard shortcuts. --- app/javascript/packs/application.js | 1 + app/javascript/src/javascripts/shortcuts.js | 35 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 395020c6d..f0eeef6f0 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -38,4 +38,5 @@ export { default as Note } from '../src/javascripts/notes.js'; export { default as PostModeMenu } from '../src/javascripts/post_mode_menu.js'; export { default as Utility } from '../src/javascripts/utility.js'; export { default as Ugoira } from '../src/javascripts/ugoira.js'; +export { default as Shortcuts } from '../src/javascripts/shortcuts.js'; export { default as TagScript } from '../src/javascripts/tag_script.js'; diff --git a/app/javascript/src/javascripts/shortcuts.js b/app/javascript/src/javascripts/shortcuts.js index 5cdc09666..444854ca5 100644 --- a/app/javascript/src/javascripts/shortcuts.js +++ b/app/javascript/src/javascripts/shortcuts.js @@ -6,6 +6,7 @@ let Shortcuts = {}; Shortcuts.initialize = function() { Utility.keydown("s", "scroll_down", Shortcuts.nav_scroll_down); Utility.keydown("w", "scroll_up", Shortcuts.nav_scroll_up); + Shortcuts.initialize_data_shortcuts(); Utility.keydown("q", "focus_search", function(e) { $("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd(); @@ -39,6 +40,40 @@ Shortcuts.initialize = function() { } } +// Bind keyboard shortcuts to links that have a `data-shortcut="..."` attribute. If multiple links have the +// same shortcut, then only the first link will be triggered by the shortcut. +// +// Add `data-shortcut-when="$selector"`, where `selector` is any valid jQuery selector, to make the shortcut +// active only when the link matches the selector. For example, `data-shortcut-when=":visible"` makes the +// shortcut apply only when the link is visible. +Shortcuts.initialize_data_shortcuts = function() { + $(document).off("keydown.danbooru.shortcut"); + + $("[data-shortcut]").each((_i, element) => { + const id = $(element).attr("id"); + const keys = $(element).attr("data-shortcut"); + const namespace = `shortcut.${id}`; + + const title = `Shortcut is ${keys.split(/\s+/).join(" or ")}`; + $(element).attr("title", title); + + Utility.keydown(keys, namespace, event => { + const e = $(`[data-shortcut="${keys}"]`).get(0); + const condition = $(e).attr("data-shortcut-when") || "*"; + + if ($(e).is(condition)) { + if ($(e).is("input, textarea")) { + e.focus(); + } else { + e.click(); + } + + event.preventDefault(); + } + }); + }); +}; + Shortcuts.nav_scroll_down = function() { var scroll_top = $(window).scrollTop() + ($(window).height() * 0.15); $(window).scrollTop(scroll_top); From bbaadda1e3af61179d2fdebe390dbe660ac82b1e Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 11 Aug 2018 16:39:45 -0500 Subject: [PATCH 2/2] Convert keyboard shortcuts to use `data-shortcut`. --- app/helpers/pagination_helper.rb | 8 ++-- app/javascript/src/javascripts/artists.js | 15 ------- .../src/javascripts/favorite_groups.js | 16 -------- app/javascript/src/javascripts/forum_posts.js | 16 -------- app/javascript/src/javascripts/notes.js | 6 +-- app/javascript/src/javascripts/paginator.js | 26 ------------ app/javascript/src/javascripts/pools.js | 18 -------- .../src/javascripts/post_popular.js | 38 ----------------- app/javascript/src/javascripts/posts.js.erb | 41 +++++-------------- app/javascript/src/javascripts/shortcuts.js | 32 --------------- app/javascript/src/javascripts/uploads.js | 9 ---- app/javascript/src/javascripts/wiki_pages.js | 25 ----------- app/presenters/post_set_presenters/popular.rb | 6 ++- app/views/artists/_secondary_links.html.erb | 4 +- .../_add_to_favgroup_dialog.html.erb | 3 +- app/views/favorites/index.html.erb | 2 +- .../forum_topics/_secondary_links.html.erb | 6 +-- app/views/pools/_secondary_links.html.erb | 4 +- .../posts/partials/common/_search.html.erb | 4 +- .../posts/partials/index/_related.html.erb | 2 +- app/views/posts/partials/show/_edit.html.erb | 2 +- .../posts/partials/show/_options.html.erb | 10 ++--- app/views/posts/show.html.erb | 2 +- app/views/uploads/new.html.erb | 4 +- .../wiki_pages/_secondary_links.html.erb | 4 +- 25 files changed, 44 insertions(+), 259 deletions(-) delete mode 100644 app/javascript/src/javascripts/paginator.js delete mode 100644 app/javascript/src/javascripts/post_popular.js delete mode 100644 app/javascript/src/javascripts/wiki_pages.js diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index 855b507f6..a0e71a619 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -4,11 +4,11 @@ module PaginationHelper if records.any? if params[:page] =~ /[ab]/ && !records.is_first_page? - html << '
  • ' + link_to("< Previous", nav_params_for("a#{records[0].id}"), :rel => "prev") + '
    • ' + html << '
  • ' + link_to("< Previous", nav_params_for("a#{records[0].id}"), rel: "prev", "data-shortcut": "a left") + '
    • ' end unless records.is_last_page? - html << '
  • ' + link_to("Next >", nav_params_for("b#{records[-1].id}"), :rel => "next") + '
    • ' + html << '
  • ' + link_to("Next >", nav_params_for("b#{records[-1].id}"), rel: "next", "data-shortcut": "d right") + '
    • ' end end @@ -29,7 +29,7 @@ module PaginationHelper window = 4 if records.current_page >= 2 - html << "
  • " + link_to(content_tag(:i, nil, class: "fas fa-chevron-left"), nav_params_for(records.current_page - 1), :rel => "prev") + "
    • " + html << "
  • " + link_to(content_tag(:i, nil, class: "fas fa-chevron-left"), nav_params_for(records.current_page - 1), rel: "prev", "data-shortcut": "a left") + "
    • " else html << "
  • " + content_tag(:i, nil, class: "fas fa-chevron-left") + "
    • " end @@ -69,7 +69,7 @@ module PaginationHelper end if records.current_page < records.total_pages && records.size > 0 - html << "
  • " + link_to(content_tag(:i, nil, class: "fas fa-chevron-right"), nav_params_for(records.current_page + 1), :rel => "next") + "
    • " + html << "
  • " + link_to(content_tag(:i, nil, class: "fas fa-chevron-right"), nav_params_for(records.current_page + 1), rel: "next", "data-shortcut": "d right") + "
    • " else html << "
  • " + content_tag(:i, nil, class: "fas fa-chevron-right") + "
    • " end diff --git a/app/javascript/src/javascripts/artists.js b/app/javascript/src/javascripts/artists.js index 83a8784df..8024cf9bf 100644 --- a/app/javascript/src/javascripts/artists.js +++ b/app/javascript/src/javascripts/artists.js @@ -1,11 +1,8 @@ -import Utility from "./utility"; - let Artist = {}; Artist.initialize_all = function() { if ($("#c-artists").length) { Artist.initialize_check_name(); - Artist.initialize_shortcuts(); } } @@ -29,18 +26,6 @@ Artist.initialize_check_name = function() { }); } -Artist.initialize_shortcuts = function() { - if ($("#c-artists #a-show").length) { - Utility.keydown("e", "edit", function(e) { - $("#artist-edit a")[0].click(); - }); - - Utility.keydown("shift+d", "delete", function(e) { - $("#artist-delete a")[0].click(); - }); - } -}; - $(document).ready(function() { Artist.initialize_all(); }); diff --git a/app/javascript/src/javascripts/favorite_groups.js b/app/javascript/src/javascripts/favorite_groups.js index 5445ed1e8..3aa7b6153 100644 --- a/app/javascript/src/javascripts/favorite_groups.js +++ b/app/javascript/src/javascripts/favorite_groups.js @@ -1,11 +1,8 @@ -import Utility from './utility' - let FavoriteGroup = {}; FavoriteGroup.initialize_all = function() { if ($("#c-posts").length && $("#a-show").length) { this.initialize_add_to_favgroup_dialog(); - Utility.keydown("1 2 3 4 5 6 7 8 9 0", "add_to_favgroup", FavoriteGroup.add_to_favgroup); } } @@ -21,10 +18,6 @@ FavoriteGroup.initialize_add_to_favgroup_dialog = function() { }); var open_favgroup_dialog = function(e) { - if (Utility.meta("current-user-id") === "") { // anonymous - return; - } - if ($(".add-to-favgroup").length === 1) { // If the user only has one favorite group we don't need to ask which group to add the post to. $(".add-to-favgroup").click(); @@ -34,18 +27,9 @@ FavoriteGroup.initialize_add_to_favgroup_dialog = function() { e.preventDefault(); } - Utility.keydown("g", "open_favgroup_dialog", open_favgroup_dialog); $("#open-favgroup-dialog-link").click(open_favgroup_dialog); } -FavoriteGroup.add_to_favgroup = function(e) { - var favgroup_index = (e.key === "0") ? "10" : e.key; - var link = $("#add-to-favgroup-" + favgroup_index + ":visible"); - if (link.length) { - link.click(); - } -} - $(function() { FavoriteGroup.initialize_all(); }); diff --git a/app/javascript/src/javascripts/forum_posts.js b/app/javascript/src/javascripts/forum_posts.js index ec855934d..d63d11f98 100644 --- a/app/javascript/src/javascripts/forum_posts.js +++ b/app/javascript/src/javascripts/forum_posts.js @@ -1,24 +1,8 @@ -import Utility from './utility' - let ForumPost = {}; ForumPost.initialize_all = function() { if ($("#c-forum-topics #a-show,#c-forum-posts #a-show").length) { this.initialize_edit_links(); - - Utility.keydown("e", "edit", function(e) { - $(".edit_forum_topic_link")[0].click(); - }); - - Utility.keydown("shift+d", "delete", function(e) { - $("#forum-topic-delete a")[0].click(); - }); - } - - if ($("#c-forum-topics").length) { - Utility.keydown("shift+r", "mark_all_as_read", function(e) { - $("#forum-topic-mark-all-as-read a")[0].click(); - }); } } diff --git a/app/javascript/src/javascripts/notes.js b/app/javascript/src/javascripts/notes.js index f4ce1d95d..43f4a6586 100644 --- a/app/javascript/src/javascripts/notes.js +++ b/app/javascript/src/javascripts/notes.js @@ -806,11 +806,7 @@ let Note = { }, initialize_shortcuts: function() { - if ($("#note-locked-notice").length === 0) { - $("#translate").click(Note.TranslationMode.toggle); - Utility.keydown("n", "translation_mode", Note.TranslationMode.toggle); - } - + $("#translate").click(Note.TranslationMode.toggle); $("#image").click(Note.Box.toggle_all); }, diff --git a/app/javascript/src/javascripts/paginator.js b/app/javascript/src/javascripts/paginator.js deleted file mode 100644 index 5a00e6726..000000000 --- a/app/javascript/src/javascripts/paginator.js +++ /dev/null @@ -1,26 +0,0 @@ -import Utility from './utility' - -let Paginator = {}; - -Paginator.next_page = function() { - var href = $(".paginator a[rel=next]").attr("href"); - if (href) { - window.location = href; - } -} - -Paginator.prev_page = function() { - var href = $(".paginator a[rel=prev]").attr("href"); - if (href) { - window.location = href; - } -} - -$(function() { - if ($(".paginator").length) { - Utility.keydown("d right", "next_page", Paginator.next_page); - Utility.keydown("a left", "prev_page", Paginator.prev_page); - } -}); - -export default Paginator diff --git a/app/javascript/src/javascripts/pools.js b/app/javascript/src/javascripts/pools.js index 67fe3986a..8e9cd5209 100644 --- a/app/javascript/src/javascripts/pools.js +++ b/app/javascript/src/javascripts/pools.js @@ -1,12 +1,6 @@ -import Utility from './utility' - let Pool = {}; Pool.initialize_all = function() { - if ($("#c-pools").length) { - this.initialize_shortcuts(); - } - if ($("#c-posts").length && $("#a-show").length) { this.initialize_add_to_pool_link(); } @@ -30,18 +24,6 @@ Pool.initialize_add_to_pool_link = function() { }); } -Pool.initialize_shortcuts = function() { - if ($("#c-pools #a-show").length) { - Utility.keydown("e", "edit", function(e) { - $("#pool-edit a")[0].click(); - }); - - Utility.keydown("shift+d", "delete", function(e) { - $("#pool-delete a")[0].click(); - }); - } -}; - Pool.initialize_simple_edit = function() { $("#sortable").sortable({ placeholder: "ui-state-placeholder" diff --git a/app/javascript/src/javascripts/post_popular.js b/app/javascript/src/javascripts/post_popular.js deleted file mode 100644 index a783adb3b..000000000 --- a/app/javascript/src/javascripts/post_popular.js +++ /dev/null @@ -1,38 +0,0 @@ -import Utility from './utility' - -let PostPopular = {}; - -PostPopular.nav_prev = function(e) { - if ($("#popular-nav-links").length) { - var href = $("#popular-nav-links a[rel=prev]").attr("href"); - if (href) { - location.href = href; - } - } - - e.preventDefault(); -} - -PostPopular.nav_next = function(e) { - if ($("#popular-nav-links").length) { - var href = $("#popular-nav-links a[rel=next]").attr("href"); - if (href) { - location.href = href; - } - } - - e.preventDefault(); -} - -PostPopular.initialize_all = function() { - if ($("#c-explore-posts").length) { - Utility.keydown("a left", "prev_page", PostPopular.nav_prev); - Utility.keydown("d right", "next_page", PostPopular.nav_next); - } -} - -$(document).ready(function() { - PostPopular.initialize_all(); -}); - -export default PostPopular diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index 8c8f409f8..18ecb592c 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -95,6 +95,17 @@ Post.initialize_edit_dialog = function() { } Post.open_edit_dialog = function() { + if ($("#edit-dialog").length === 1) { + return; + } + + $("#edit").show(); + $("#comments").hide(); + $("#share").hide(); + $("#post-sections li").removeClass("active"); + $("#post-edit-link").parent("li").addClass("active"); + $("#related-tags-container").show(); + var $tag_string = $("#post_tag_string,#upload_tag_string"); $("div.input").has($tag_string).prevAll().hide(); $("#open-edit-dialog").hide(); @@ -230,22 +241,8 @@ Post.swipe_next = function(e) { Post.initialize_shortcuts = function() { if ($("#a-show").length) { - Utility.keydown("e", "edit", function(e) { - $("#post-edit-link").trigger("click"); - $("#post_tag_string").focus(); - e.preventDefault(); - }); - - if (Utility.meta("current-user-can-approve-posts") === "true") { - Utility.keydown("shift+o", "approve", function(e) { - $(".approve-link").click(); - }); - } - Utility.keydown("a", "prev_page", Post.nav_prev); Utility.keydown("d", "next_page", Post.nav_next); - Utility.keydown("f", "favorite", Post.favorite); - Utility.keydown("shift+f", "unfavorite", Post.unfavorite); } } @@ -586,22 +583,6 @@ Post.approve = function(post_id) { }); } -Post.favorite = function (e) { - if ($("#add-to-favorites").is(":visible")) { - $("#add-to-favorites")[0].click(); - } else if (Utility.meta("current-user-id") === "") { - $(window).trigger("danbooru:notice", "You must be logged in to favorite posts"); - } else { - $(window).trigger("danbooru:notice", "You have already favorited this post"); - } -}; - -Post.unfavorite = function (e) { - $.ajax("/favorites/" + Utility.meta("post-id") + ".js", { - type: "DELETE" - }); -}; - Post.initialize_saved_searches = function() { $("#new_saved_search #saved_search_label_string").autocomplete({ search: function() { diff --git a/app/javascript/src/javascripts/shortcuts.js b/app/javascript/src/javascripts/shortcuts.js index 444854ca5..476ed6be7 100644 --- a/app/javascript/src/javascripts/shortcuts.js +++ b/app/javascript/src/javascripts/shortcuts.js @@ -1,5 +1,4 @@ import Utility from './utility' -import Post from './posts.js.erb' let Shortcuts = {}; @@ -7,37 +6,6 @@ Shortcuts.initialize = function() { Utility.keydown("s", "scroll_down", Shortcuts.nav_scroll_down); Utility.keydown("w", "scroll_up", Shortcuts.nav_scroll_up); Shortcuts.initialize_data_shortcuts(); - - Utility.keydown("q", "focus_search", function(e) { - $("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd(); - e.preventDefault(); - }); - - if ($("#image").length) { // post page or bookmarklet upload page - Utility.keydown("shift+e", "edit_dialog", function(e) { - if (Utility.meta("current-user-id") === "") { // anonymous - return; - } - - if (!$("#edit-dialog").length) { - $("#edit").show(); - $("#comments").hide(); - $("#share").hide(); - $("#post-sections li").removeClass("active"); - $("#post-edit-link").parent("li").addClass("active"); - $("#related-tags-container").show(); - - Post.open_edit_dialog(); - } - e.preventDefault(); - }); - } - - if ($("#c-posts #a-index, #c-favorites #a-index").length) { - Utility.keydown("r", "random", function(e) { - $("#random-post")[0].click(); - }); - } } // Bind keyboard shortcuts to links that have a `data-shortcut="..."` attribute. If multiple links have the diff --git a/app/javascript/src/javascripts/uploads.js b/app/javascript/src/javascripts/uploads.js index 99ef33de8..3a8649d41 100644 --- a/app/javascript/src/javascripts/uploads.js +++ b/app/javascript/src/javascripts/uploads.js @@ -1,4 +1,3 @@ -import Utility from './utility' import Post from './posts.js.erb' import RelatedTag from './related_tag.js.erb' @@ -18,7 +17,6 @@ Upload.initialize_all = function() { } this.initialize_info_bookmarklet(); this.initialize_similar(); - this.initialize_shortcuts(); this.initialize_submit(); $("#related-tags-button").trigger("click"); @@ -55,13 +53,6 @@ Upload.initialize_submit = function() { }); } -Upload.initialize_shortcuts = function() { - Utility.keydown("e", "edit", function(e) { - $("#upload_tag_string").focus(); - e.preventDefault(); - }); -}; - Upload.initialize_iqdb_source = function() { if (/^https?:\/\//.test($("#normalized_url").val())) { $.get("/iqdb_queries", {"url": $("#normalized_url").val()}).done(function(html) {$("#iqdb-similar").html(html)}); diff --git a/app/javascript/src/javascripts/wiki_pages.js b/app/javascript/src/javascripts/wiki_pages.js deleted file mode 100644 index 637d9929e..000000000 --- a/app/javascript/src/javascripts/wiki_pages.js +++ /dev/null @@ -1,25 +0,0 @@ -import Utility from './utility' - -let WikiPage = {}; - -WikiPage.initialize_all = function() { - if ($("#c-wiki-pages,#c-wiki-page-versions").length) { - this.initialize_shortcuts(); - } -} - -WikiPage.initialize_shortcuts = function() { - if ($("#a-show").length) { - Utility.keydown("e", "edit", function(e) { - $("#wiki-page-edit a")[0].click(); - }); - - Utility.keydown("shift+d", "delete", function(e) { - $("#wiki-page-delete a")[0].click(); - }); - } -} - -$(document).ready(function() { - WikiPage.initialize_all(); -}); diff --git a/app/presenters/post_set_presenters/popular.rb b/app/presenters/post_set_presenters/popular.rb index db95f8c7a..6d7012fa3 100644 --- a/app/presenters/post_set_presenters/popular.rb +++ b/app/presenters/post_set_presenters/popular.rb @@ -76,7 +76,8 @@ module PostSetPresenters :date => prev_date_for_scale(scale), :scale => scale.downcase ), - :rel => (link_rel_for_scale?(template, scale.downcase) ? "prev" : nil) + :rel => (link_rel_for_scale?(template, scale.downcase) ? "prev" : nil), + :"data-shortcut" => (link_rel_for_scale?(template, scale.downcase) ? "a left" : nil) ) html << template.link_to( scale, @@ -92,7 +93,8 @@ module PostSetPresenters :date => next_date_for_scale(scale), :scale => scale.downcase ), - :rel => (link_rel_for_scale?(template, scale.downcase) ? "next" : nil) + :rel => (link_rel_for_scale?(template, scale.downcase) ? "next" : nil), + :"data-shortcut" => (link_rel_for_scale?(template, scale.downcase) ? "d right" : nil) ) html << '' html.join("\n").html_safe diff --git a/app/views/artists/_secondary_links.html.erb b/app/views/artists/_secondary_links.html.erb index 496fb339d..f375ff65d 100644 --- a/app/views/artists/_secondary_links.html.erb +++ b/app/views/artists/_secondary_links.html.erb @@ -10,12 +10,12 @@
  • <%= link_to "Posts (#{Post.fast_count(@artist.name)})", posts_path(:tags => @artist.name) %>
  • <%= link_to "Show", artist_path(@artist) %>
    • <% if CurrentUser.is_member? %> -
  • <%= link_to "Edit", edit_artist_path(@artist) %>
    • +
  • <%= link_to "Edit", edit_artist_path(@artist), :"data-shortcut" => "e" %>
    • <% end %>
  • <%= link_to "History", artist_versions_path(:search => {:artist_id => @artist.id}) %>
    • <% if @artist.deletable_by?(CurrentUser.user) %> <% if @artist.is_active? %> -
  • <%= link_to "Delete", artist_path(@artist), method: :delete, data: {confirm: "Are you sure you want to delete this artist?"} %>
    • +
  • <%= link_to "Delete", artist_path(@artist), method: :delete, "data-shortcut": "shift+d", "data-confirm": "Are you sure you want to delete this artist?" %>
    • <% else %>
  • <%= link_to "Undelete", artist_path(@artist, format: "js"), method: :put, data: {confirm: "Are you sure you want to undelete this artist?", params: "artist[is_active]=true"}, remote: true %>
    • <% end %> diff --git a/app/views/favorite_groups/_add_to_favgroup_dialog.html.erb b/app/views/favorite_groups/_add_to_favgroup_dialog.html.erb index 428c9a7fe..48b35c55e 100644 --- a/app/views/favorite_groups/_add_to_favgroup_dialog.html.erb +++ b/app/views/favorite_groups/_add_to_favgroup_dialog.html.erb @@ -6,6 +6,7 @@ <%= link_to favgroup.name, add_post_favorite_group_path(favgroup, :post_id => post.id, :format => :js), :id => "add-to-favgroup-#{i + 1}", :class => "add-to-favgroup", - :method => :put, :remote => true %> + :method => :put, :remote => true, + :"data-shortcut" => (i + 1) % 10, :"data-shortcut-when" => ":visible" %> <% end %> diff --git a/app/views/favorites/index.html.erb b/app/views/favorites/index.html.erb index 57d41aa46..630e0fcbe 100644 --- a/app/views/favorites/index.html.erb +++ b/app/views/favorites/index.html.erb @@ -17,7 +17,7 @@ diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb index 1e1c0d846..4d727ba64 100644 --- a/app/views/forum_topics/_secondary_links.html.erb +++ b/app/views/forum_topics/_secondary_links.html.erb @@ -7,7 +7,7 @@
  • <%= link_to "New", new_forum_topic_path %>
  • <%= link_to "Request alias", new_tag_alias_request_path %>
  • <%= link_to "Request implication", new_tag_implication_request_path %>
    • -
  • <%= link_to "Mark all as read", mark_all_as_read_forum_topics_path, :method => :post %>
    • +
  • <%= link_to "Mark all as read", mark_all_as_read_forum_topics_path, :method => :post, :"data-shortcut" => "shift+r" %>
    • <% end %>
  • <%= link_to "Search", search_forum_posts_path %>
    • @@ -21,12 +21,12 @@
  • <%= link_to "Subscribe", subscribe_forum_topic_path(@forum_topic), :method => :post, :data => {:confirm => "Are you sure you want to receive email notifications for this forum topic?"} %>
    • <% end %> <% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %> -
  • <%= link_to "Edit", edit_forum_topic_path(@forum_topic) %>
    • +
  • <%= link_to "Edit", edit_forum_topic_path(@forum_topic), "data-shortcut": "e" %>
    • <% if CurrentUser.is_moderator? %> <% if @forum_topic.is_deleted? %>
  • <%= link_to "Undelete", undelete_forum_topic_path(@forum_topic), :method => :post %>
    • <% else %> -
  • <%= link_to "Delete", forum_topic_path(@forum_topic), :method => :delete, :data => {:confirm => "Are you sure you want to delete this forum topic?"} %>
    • +
  • <%= link_to "Delete", forum_topic_path(@forum_topic), :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this forum topic?" %>
    • <% end %> <% if @forum_topic.is_locked? %>
  • <%= link_to "Unlock", forum_topic_path(@forum_topic, :forum_topic => {:is_locked => false}), :method => :put %>
    • diff --git a/app/views/pools/_secondary_links.html.erb b/app/views/pools/_secondary_links.html.erb index 39e5c4d2e..ac2272b4c 100644 --- a/app/views/pools/_secondary_links.html.erb +++ b/app/views/pools/_secondary_links.html.erb @@ -10,13 +10,13 @@
  • <%= link_to "Show", pool_path(@pool) %>
  • <%= link_to "Posts", posts_path(:tags => "pool:#{@pool.id}") %>
    • <% if CurrentUser.is_member? %> -
  • <%= link_to "Edit", edit_pool_path(@pool) %>
    • +
  • <%= link_to "Edit", edit_pool_path(@pool), "data-shortcut": "e" %>
    • <% end %> <% if @pool.deletable_by?(CurrentUser.user) %> <% if @pool.is_deleted? %>
  • <%= link_to "Undelete", undelete_pool_path(@pool), :method => :post, :remote => true %>
    • <% else %> -
  • <%= link_to "Delete", pool_path(@pool), :method => :delete, :data => {:confirm => "Are you sure you want to delete this pool?"}, :remote => true %>
    • +
  • <%= link_to "Delete", pool_path(@pool), :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this pool?", :remote => true %>
    • <% end %> <% end %> <% if PoolArchive.enabled? %> diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb index 7229bc50f..aa2f80fd7 100644 --- a/app/views/posts/partials/common/_search.html.erb +++ b/app/views/posts/partials/common/_search.html.erb @@ -12,7 +12,7 @@ <% if params[:random] %> <%= hidden_field_tag :random, params[:random] %> <% end %> - <%= text_field_tag("tags", tags, :id => tags_dom_id, :data => { :autocomplete => "tag-query" }) %><%= content_tag "button", content_tag("i", nil, class: "fas fa-search"), type: "submit" %> + <%= text_field_tag("tags", tags, :id => tags_dom_id, :"data-shortcut" => "q", :"data-autocomplete" => "tag-query") %><%= content_tag "button", content_tag("i", nil, class: "fas fa-search"), type: "submit" %> <%= hidden_field_tag "ms", "1" %> <% end %> @@ -31,4 +31,4 @@ }); });*/ -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/posts/partials/index/_related.html.erb b/app/views/posts/partials/index/_related.html.erb index 8d69bfdd9..13a9021eb 100644 --- a/app/views/posts/partials/index/_related.html.erb +++ b/app/views/posts/partials/index/_related.html.erb @@ -14,7 +14,7 @@
  • <%= link_to "Deleted", posts_path(:tags => "#{params[:tags]} status:deleted"), :rel => "nofollow" %>
    • -
  • <%= link_to "Random", random_posts_path(:tags => params[:tags]), :id => "random-post", :rel => "nofollow" %>
    • +
  • <%= link_to "Random", random_posts_path(:tags => params[:tags]), :id => "random-post", :rel => "nofollow", :"data-shortcut" => "r" %>
  • <%= link_to "Count", posts_counts_path(:tags => params[:tags]) %>
    • diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index 1bbed2490..f70a07af4 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -80,7 +80,7 @@
    <%= f.label :tag_string, "Tags" %> <%= f.text_area :tag_string, :size => "50x5", :value => post.presenter.categorized_tag_string + " ", :data => { :autocomplete => "tag-edit" } %> -
    <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index 80c227a4f..d2230acc5 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -2,20 +2,20 @@
  • <%= 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", :title => "Shortcut is F" %>
    • -
  • <%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %>
    • +
  • <%= 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_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? %>
  • Note locked
    • <% else %> -
  • <%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is N" %>
    • +
  • <%= link_to "Add note", "#", :id => "translate", :"data-shortcut" => "n" %>
    • <% end %> <% if CurrentUser.is_builder? && post.has_notes? %>
  • <%= link_to "Copy notes", "#", :id => "copy-notes" %>
    • <% end %>
  • <%= link_to "Add commentary", "#", :id => "add-commentary" %>
    • -
  • <%= link_to "Add to favorite group", "#", :id => "open-favgroup-dialog-link" %>
    • +
  • <%= link_to "Add to favorite group", "#", :id => "open-favgroup-dialog-link", :"data-shortcut" => "g" %>
  • <%= link_to "Find similar", iqdb_queries_path(:post_id => post.id) %>
    • <% if post.is_status_locked? %> @@ -40,7 +40,7 @@ <% end %> <% if post.is_flagged? || post.is_pending? %> -
  • <%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve", :data => { :confirm => "Are you sure you want to approve this post?" } %>
    • +
  • <%= 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 %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 069f7a343..b6c02c7c8 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -94,7 +94,7 @@ <% end %> <% if CurrentUser.is_member? && @post.visible? %> -
  • Edit
    • +
  • Edit
    • <% end %>
  • Share
    • diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index e17750c55..78a0b90be 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -111,8 +111,8 @@
    <%= f.label :tag_string, "Tags" %> - <%= f.text_area :tag_string, :size => "60x5", :spellcheck => false, :data => { :autocomplete => "tag-edit" } %> -
    <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb index a95eb10d0..5cefde78f 100644 --- a/app/views/wiki_pages/_secondary_links.html.erb +++ b/app/views/wiki_pages/_secondary_links.html.erb @@ -18,10 +18,10 @@
  • <%= link_to "Posts (#{@wiki_page.tag.try(:post_count) || 0})", posts_path(:tags => @wiki_page.title) %>
  • <%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %>
    • <% if CurrentUser.is_member? %> -
  • <%= link_to "Edit", edit_wiki_page_path(@wiki_page) %>
    • +
  • <%= link_to "Edit", edit_wiki_page_path(@wiki_page), "data-shortcut": "e" %>
    • <% end %> <% if CurrentUser.is_builder? && !@wiki_page.is_deleted? %> -
  • <%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :data => {:confirm => "Are you sure you want to delete this wiki page?"} %>
    • +
  • <%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this wiki page?" %>
    • <% end %> <% elsif @wiki_page_version %>
  • |