From 73edc3c86f81d2bcd9595a6dbd1f38cc8d5c0bcd Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 9 Mar 2013 11:08:06 -0500 Subject: [PATCH] fixes #578 --- app/assets/javascripts/posts.js | 16 ++++++++-------- app/models/user.rb | 4 ---- app/presenters/user_presenter.rb | 7 ++----- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 65d2cc73e..66bf25599 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -110,15 +110,15 @@ Danbooru.Post.nav_next(); e.preventDefault(); }); - - $(document).bind("keydown.s", function(e) { - Danbooru.Post.nav_scroll_down(); - }) - - $(document).bind("keydown.w", function(e) { - Danbooru.Post.nav_scroll_up(); - }) } + + $(document).bind("keydown.s", function(e) { + Danbooru.Post.nav_scroll_down(); + }) + + $(document).bind("keydown.w", function(e) { + Danbooru.Post.nav_scroll_up(); + }) } Danbooru.Post.initialize_links = function() { diff --git a/app/models/user.rb b/app/models/user.rb index 51a8177d5..556f2d509 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -443,10 +443,6 @@ class User < ActiveRecord::Base limit = 10 + (approved_count / 10) - (deleted_count / 4) - pending_count end - if limit > 20 - limit = 20 - end - if limit < 0 limit = 0 end diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index dfc657e9b..8d1729288 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -50,12 +50,9 @@ class UserPresenter string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}" end - if limit >= 20 - limit = 20 - string += " = capped:20" - elsif limit < 0 + if limit < 0 limit = 0 - string += " = capped:0" + string += " = 0" else string += " = #{limit}" end