From 45e24c54cebf799955beafd30a5f849c01fcc0ba Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Wed, 4 Sep 2013 06:01:23 +0800
Subject: [PATCH] pagination scroll block fix + cleanup

---
 public/src/forum/topic.js   | 13 +++++++++++--
 public/templates/header.tpl |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 7d9719fd9a..5d66ae74bc 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -615,6 +615,15 @@
 	var	postcount = templates.get('postcount');
 
 	function updateHeader() {
+		if (pagination == null) {
+			jQuery('.pagination-block i:first').on('click', function() {
+				app.scrollToTop();
+			});
+			jQuery('.pagination-block i:last').on('click', function() {
+				app.scrollToBottom();
+			});
+		}
+
 		jQuery('.post-author-info').css('bottom', '0px');
 		postAuthorImage = postAuthorImage || document.getElementById('post-author-image');
 		postAuthorInfo = postAuthorInfo || document.getElementById('post-author-info');
@@ -651,7 +660,7 @@
 
 
 		    if (inView) {
-		    	pagination.innerHTML = this.postnumber + ' / ' + postcount;
+		    	pagination.innerHTML = this.postnumber + ' out of ' + postcount;
 				postAuthorImage.src = (jQuery(this).find('.profile-image-block img').attr('src'));
 				postAuthorInfo.innerHTML = 'Posted by ' + jQuery(this).attr('data-username') + ', ' + jQuery(this).find('.relativeTimeAgo').html();
 		    }
@@ -659,7 +668,7 @@
 
 		setTimeout(function() {
 			if(scrollTop + windowHeight == jQuery(document).height()) {
-				pagination.innerHTML = postcount + ' / ' + postcount;
+				pagination.innerHTML = postcount + ' out of ' + postcount;
 			}
 		}, 100);
 	}
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 5b9a0d328d..4f979af747 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -83,9 +83,9 @@
 				</ul>
 
 				<div class="pagination-block">
-					<i class="icon-upload pointer" onclick="app.scrollToTop()"></i>
+					<i class="icon-upload pointer"></i>
 					<span id="pagination"></span>
-					<i class="icon-upload pointer icon-rotate-180" onclick="app.scrollToBottom()"></i>
+					<i class="icon-upload pointer icon-rotate-180"></i>
 				</div>
 			</div>
 		</div>