diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index a1fe66e5a..8fd96cd7b 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -15,11 +15,7 @@ e.preventDefault(); }); - if ($("#image").length) { - $(document).bind("keypress", "shift+o", function(e) { - Danbooru.Post.approve(Danbooru.meta("post-id")); - }); - + if ($("#image").length) { // post page or bookmarklet upload page $(document).bind("keypress", "shift+e", function(e) { if (!$("#edit-dialog").length) { $("#edit").show(); @@ -34,6 +30,22 @@ e.preventDefault(); }); } + + if ($("#c-posts").length && $("#a-show").length) { + $(document).bind("keypress", "shift+o", function(e) { + Danbooru.Post.approve(Danbooru.meta("post-id")); + }); + + $(document).bind("keypress", "r", function(e) { + $("#random-post")[0].click(); + }); + } + + if ($("#c-posts").length && $("#a-index").length) { + $(document).bind("keypress", "r", function(e) { + $("#random-post")[0].click(); + }); + } } Danbooru.Shortcuts.nav_scroll_down = function() { diff --git a/app/views/posts/partials/index/_related.html.erb b/app/views/posts/partials/index/_related.html.erb index 499b49d55..eddcb8b20 100644 --- a/app/views/posts/partials/index/_related.html.erb +++ b/app/views/posts/partials/index/_related.html.erb @@ -9,7 +9,7 @@
  • <%= link_to "Edit subscriptions", tag_subscriptions_path %>
  • <% end %> -
  • <%= link_to "Random post", random_posts_path(:tags => params[:tags]) %>
  • +
  • <%= link_to "Random post", random_posts_path(:tags => params[:tags]), :id => "random-post" %>
  • <%= link_to "Mobile version", mobile_posts_path(:tags => params[:tags]) %>
  • diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb index 18996f2ba..9f777900d 100644 --- a/app/views/posts/partials/show/_options.html.erb +++ b/app/views/posts/partials/show/_options.html.erb @@ -3,7 +3,7 @@
  • <%= 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 "Edit", "#", :id => "side-edit-link" %>
  • -
  • <%= link_to "Random post", random_posts_path(:tags => params[:tags]) %>
  • +
  • <%= link_to "Random post", random_posts_path(:tags => params[:tags]), :id => "random-post" %>
  • <%= link_to "Add to pool", "#", :id => "pool" %>
  • <% if post.is_note_locked? %>
  • Note locked
  • diff --git a/app/views/static/keyboard_shortcuts.html.erb b/app/views/static/keyboard_shortcuts.html.erb index 284a6825f..825300e87 100644 --- a/app/views/static/keyboard_shortcuts.html.erb +++ b/app/views/static/keyboard_shortcuts.html.erb @@ -10,6 +10,7 @@
  • q Search
  • w Scroll up
  • s Scroll down
  • +
  • r Go to random post
  • @@ -27,6 +28,7 @@
  • a Previous post
  • d Next post
  • f Favorite post
  • +
  • r Go to random post