From 548ec6baf72016ea6eb11df7553875dd4ae10b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 3 Dec 2017 08:32:31 -0500
Subject: [PATCH] closes #6144

---
 public/src/client/topic.js      | 24 --------------
 public/src/modules/navigator.js | 56 ++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 57d276d986..b3fa02b509 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -29,7 +29,6 @@ define('forum/topic', [
 			app.removeAlert('bookmark');
 
 			events.removeListeners();
-			$(window).off('keydown', onKeyDown);
 
 			require(['search'], function (search) {
 				if (search.topicDOM.active) {
@@ -63,8 +62,6 @@ define('forum/topic', [
 
 		addParentHandler();
 
-		handleKeys();
-
 		navigator.init('[component="post"]', ajaxify.data.postcount, Topic.toTop, Topic.toBottom, Topic.navigatorCallback, Topic.calculateIndex);
 
 		handleBookmark(tid);
@@ -76,27 +73,6 @@ define('forum/topic', [
 		$(window).trigger('action:topic.loaded', ajaxify.data);
 	};
 
-	function handleKeys() {
-		if (!config.usePagination) {
-			$(window).off('keydown', onKeyDown).on('keydown', onKeyDown);
-		}
-	}
-
-	function onKeyDown(ev) {
-		if (ev.target.nodeName === 'BODY') {
-			if (ev.shiftKey || ev.ctrlKey || ev.altKey) {
-				return;
-			}
-			if (ev.which === 36) { // home key
-				Topic.toTop();
-				return false;
-			} else if (ev.which === 35) { // end key
-				Topic.toBottom();
-				return false;
-			}
-		}
-	}
-
 	function handleTopicSearch() {
 		require(['search', 'mousetrap'], function (search, mousetrap) {
 			$('.topic-search').off('click')
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index ac6c06ac88..6c820cdd7f 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -8,12 +8,16 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 
 	navigator.scrollActive = false;
 
+	$(window).on('action:ajaxify.start', function () {
+		$(window).off('keydown', onKeyDown);
+	});
+
 	navigator.init = function (selector, count, toTop, toBottom, callback, calculateIndex) {
 		index = 1;
 		navigator.selector = selector;
 		navigator.callback = callback;
-		toTop = toTop || function () {};
-		toBottom = toBottom || function () {};
+		navigator.toTop = toTop || function () {};
+		navigator.toBottom = toBottom || function () {};
 
 		$(window).off('scroll', navigator.delayedUpdate).on('scroll', navigator.delayedUpdate);
 
@@ -29,8 +33,8 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 
 		$('.pagination-block .pageup').off('click').on('click', navigator.scrollUp);
 		$('.pagination-block .pagedown').off('click').on('click', navigator.scrollDown);
-		$('.pagination-block .pagetop').off('click').on('click', toTop);
-		$('.pagination-block .pagebottom').off('click').on('click', toBottom);
+		$('.pagination-block .pagetop').off('click').on('click', navigator.toTop);
+		$('.pagination-block .pagebottom').off('click').on('click', navigator.toBottom);
 
 		$('.pagination-block input').on('keydown', function (e) {
 			if (e.which === 13) {
@@ -52,10 +56,33 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 			}
 		});
 
+		handleKeys();
+
 		navigator.setCount(count);
 		navigator.update(0);
 	};
 
+	function handleKeys() {
+		if (!config.usePagination) {
+			$(window).off('keydown', onKeyDown).on('keydown', onKeyDown);
+		}
+	}
+
+	function onKeyDown(ev) {
+		if (ev.target.nodeName === 'BODY') {
+			if (ev.shiftKey || ev.ctrlKey || ev.altKey) {
+				return;
+			}
+			if (ev.which === 36 && navigator.toTop) { // home key
+				navigator.toTop();
+				return false;
+			} else if (ev.which === 35 && navigator.toBottom) { // end key
+				navigator.toBottom();
+				return false;
+			}
+		}
+	}
+
 	function generateUrl(index) {
 		var pathname = window.location.pathname.replace(config.relative_path, '');
 		var parts = pathname.split('/');
@@ -164,13 +191,26 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 			return;
 		}
 		index = index > count ? count : index;
-
-		$('.pagination-block .pagination-text').translateHtml('[[global:pagination.out_of, ' + index + ', ' + count + ']]');
-		var fraction = $(window).scrollTop() / ($(document).height() - $(window).height());
+		var relIndex = getRelativeIndex();
+		$('.pagination-block .pagination-text').translateHtml('[[global:pagination.out_of, ' + relIndex + ', ' + count + ']]');
+		var fraction = relIndex / count;
 		$('.pagination-block meter').val(fraction);
 		$('.pagination-block .progress-bar').width((fraction * 100) + '%');
 	};
 
+	function getRelativeIndex() {
+		var relIndex = index;
+		if (relIndex === 1) {
+			return 1;
+		}
+		if (ajaxify.data.template.topic) {
+			if (config.topicPostSort === 'most_votes' || config.topicPostSort === 'newest_to_oldest') {
+				relIndex = ajaxify.data.postcount - index + 2;
+			}
+		}
+		return relIndex;
+	}
+
 	navigator.scrollUp = function () {
 		$('body,html').animate({
 			scrollTop: $(window).scrollTop() - $(window).height(),
@@ -244,7 +284,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
 			}
 		} else if (inCategory) {
 			if (config.categoryTopicSort === 'most_posts' || config.categoryTopicSort === 'oldest_to_newest') {
-				index = ajaxify.data.ajaxify.data.topic_count - index;
+				index = ajaxify.data.topic_count - index;
 			}
 		}