fixes #578
This commit is contained in:
@@ -110,15 +110,15 @@
|
|||||||
Danbooru.Post.nav_next();
|
Danbooru.Post.nav_next();
|
||||||
e.preventDefault();
|
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() {
|
Danbooru.Post.initialize_links = function() {
|
||||||
|
|||||||
@@ -443,10 +443,6 @@ class User < ActiveRecord::Base
|
|||||||
limit = 10 + (approved_count / 10) - (deleted_count / 4) - pending_count
|
limit = 10 + (approved_count / 10) - (deleted_count / 4) - pending_count
|
||||||
end
|
end
|
||||||
|
|
||||||
if limit > 20
|
|
||||||
limit = 20
|
|
||||||
end
|
|
||||||
|
|
||||||
if limit < 0
|
if limit < 0
|
||||||
limit = 0
|
limit = 0
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -50,12 +50,9 @@ class UserPresenter
|
|||||||
string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}"
|
string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}"
|
||||||
end
|
end
|
||||||
|
|
||||||
if limit >= 20
|
if limit < 0
|
||||||
limit = 20
|
|
||||||
string += " = capped:20"
|
|
||||||
elsif limit < 0
|
|
||||||
limit = 0
|
limit = 0
|
||||||
string += " = capped:0"
|
string += " = 0"
|
||||||
else
|
else
|
||||||
string += " = #{limit}"
|
string += " = #{limit}"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user