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

better scrolling js

Browse Source
This commit is contained in:
albert
2013-02-25 11:24:29 -05:00
parent 436c9af9da
commit 2aa141aa69
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/assets/javascripts/posts.js
View File

@@ -2,7 +2,6 @@
Danbooru.Post = {}; Danbooru.Post = {};
Danbooru.Post.pending_update_count = 0; Danbooru.Post.pending_update_count = 0;
Danbooru.Post.scroll_top = 0;
Danbooru.Post.initialize_all = function() { Danbooru.Post.initialize_all = function() {
this.initialize_titles(); this.initialize_titles();
@@ -49,6 +48,27 @@
e.preventDefault(); e.preventDefault();
}); });
} }
Danbooru.Post.nav_pool_prev = function() {
location.href = $("#pool-nav a.active[rel=prev]").attr("href");
}
Danbooru.Post.nav_pool_next = function() {
location.href = $("#pool-nav a.active[rel=next]").attr("href");
}
Danbooru.Post.nav_pool_scroll = function() {
var scroll_top = $(window).scrollTop() + $(window).height();
if (scroll_top > $("#image").height() + $("#image").offset().top + 100) {
location.href = $("#pool-nav a.active[rel=next]").attr("href");
return;
}
$('html, body').animate({
scrollTop: scroll_top
}, 250);
}
Danbooru.Post.initialize_shortcuts = function() { Danbooru.Post.initialize_shortcuts = function() {
$(document).bind("keydown./", function(e) { $(document).bind("keydown./", function(e) {
@@ -64,25 +84,18 @@
}); });
$(document).bind("keydown.left", function(e) { $(document).bind("keydown.left", function(e) {
location.href = $("#pool-nav a.active[rel=prev]").attr("href"); Danbooru.Post.nav_pool_prev();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.right", function(e) { $(document).bind("keydown.right", function(e) {
location.href = $("#pool-nav a.active[rel=next]").attr("href"); Danbooru.Post.nav_pool_prev();
e.preventDefault(); e.preventDefault();
}); });
$(document).bind("keydown.space", function() { $(document).bind("keydown.space", function(e) {
Danbooru.Post.scroll_top = Danbooru.Post.scroll_top + 800; Danbooru.Post.nav_pool_scroll();
e.preventDefault();
if (Danbooru.Post.scroll_top > $("#image").height() + $("#image").offset().top + 100) {
location.href = $("#pool-nav a.active[rel=next]").attr("href");
}
$('html, body').animate({
scrollTop: Danbooru.Post.scroll_top
}, 500);
}) })
} }
} }

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

@@ -14,7 +14,7 @@
"title": "<%= j post.presenter.humanized_essential_tag_string %>" "title": "<%= j post.presenter.humanized_essential_tag_string %>"
}; };
</script> </script>
<script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f8dbf8a41066ac7"></script> <script type="text/javascript" src="xhttp://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f8dbf8a41066ac7"></script>
<!-- AddThis Button END --> <!-- AddThis Button END -->
</div> </div>