From 2aa141aa69673676140ccd61b763eff7a7e38657 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 25 Feb 2013 11:24:29 -0500
Subject: [PATCH] better scrolling js

---
 app/assets/javascripts/posts.js               | 39 ++++++++++++-------
 app/views/posts/partials/show/_share.html.erb |  2 +-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index b28068160..715cfb571 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -2,7 +2,6 @@
   Danbooru.Post = {};
 
   Danbooru.Post.pending_update_count = 0;
-  Danbooru.Post.scroll_top = 0;
 
   Danbooru.Post.initialize_all = function() {
     this.initialize_titles();
@@ -49,6 +48,27 @@
   		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() {
     $(document).bind("keydown./", function(e) {
@@ -64,25 +84,18 @@
       });
 
       $(document).bind("keydown.left", function(e) {
-        location.href = $("#pool-nav a.active[rel=prev]").attr("href");
+        Danbooru.Post.nav_pool_prev();
         e.preventDefault();
       });
 
       $(document).bind("keydown.right", function(e) {
-        location.href = $("#pool-nav a.active[rel=next]").attr("href");
+        Danbooru.Post.nav_pool_prev();
         e.preventDefault();
       });
       
-      $(document).bind("keydown.space", function() {
-        Danbooru.Post.scroll_top = Danbooru.Post.scroll_top + 800;
-        
-        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);
+      $(document).bind("keydown.space", function(e) {
+        Danbooru.Post.nav_pool_scroll();
+        e.preventDefault();
       })
     }
   }
diff --git a/app/views/posts/partials/show/_share.html.erb b/app/views/posts/partials/show/_share.html.erb
index 53afa9930..019154b3a 100644
--- a/app/views/posts/partials/show/_share.html.erb
+++ b/app/views/posts/partials/show/_share.html.erb
@@ -14,7 +14,7 @@
       "title": "<%= j post.presenter.humanized_essential_tag_string %>"
     };
   </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 -->  
 </div>