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

Fix keyboard navigation in pools (#3238).

Browse Source 
Don't display the search navigation bar when browsing pools. Doing so
breaks the A/D keyboard shortcuts because the search navigator takes
precedence over the pool navigator.

https://danbooru.donmai.us/forum_topics/9127?page=195#forum_post_134297
This commit is contained in:
evazion
2017-08-04 19:28:36 -05:00
parent 7b96d9dcd4
commit 40e006f7cb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/presenters/post_presenter.rb
View File

@@ -196,11 +196,13 @@ class PostPresenter < Presenter
end
def has_nav_links?(template)
has_sequential_navigation?(template) || @post.pools.undeleted.any? || @post.favorite_groups(active_id=template.params[:favgroup_id]).any?
has_sequential_navigation?(template.params) || @post.pools.undeleted.any? || @post.favorite_groups(active_id=template.params[:favgroup_id]).any?
end
def has_sequential_navigation?(template)
CurrentUser.user.enable_sequential_post_navigation && template.params[:tags] !~ /(?:^|\s)(?:order|ordfav|ordpool):/i
def has_sequential_navigation?(params)
return false if params[:tags] =~ /(?:^|\s)(?:order|ordfav|ordpool):/i
return false if params[:pool_id].present? || params[:favgroup_id].present?
return CurrentUser.user.enable_sequential_post_navigation
end
def post_footer_for_pool_html(template)

2
app/views/posts/partials/show/_nav_links.html.erb
View File

@@ -1,6 +1,6 @@
<% if (position == "bottom" && CurrentUser.user.new_post_navigation_layout) || (position == "top" && !CurrentUser.user.new_post_navigation_layout) %>
<div id="nav-links" class="ui-corner-all nav-notice">
<% if post.presenter.has_sequential_navigation?(self) %>
<% if post.presenter.has_sequential_navigation?(params) %>
<%= render "posts/partials/show/search_seq", :post => post %>
<% end %>