From bbfec7d443b08cde2167e11ea14130495b4ff60f Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 12 Jan 2015 17:54:07 -0500
Subject: [PATCH] fix post index parse

---
 public/src/ajaxify.js       | 4 ++--
 public/src/app.js           | 3 ++-
 public/src/client/recent.js | 2 +-
 public/src/client/topic.js  | 5 ++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index d53c89b651..e6cce7a920 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -53,8 +53,6 @@ $(document).ready(function() {
 
 			$(window).off('scroll');
 
-			$(window).trigger('action:ajaxify.start', {url: url});
-
 			if ($('#content').hasClass('ajaxifying') && apiXHR) {
 				apiXHR.abort();
 			}
@@ -64,6 +62,8 @@ $(document).ready(function() {
 
 			var tpl_url = ajaxify.getTemplateMapping(url);
 
+			$(window).trigger('action:ajaxify.start', {url: url, tpl_url: tpl_url});
+
 			var hash = '';
 			if(ajaxify.initialLoad) {
 				hash = window.location.hash ? window.location.hash : '';
diff --git a/public/src/app.js b/public/src/app.js
index a3d8fa62ca..ea567e239e 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -497,7 +497,8 @@ app.uid = null;
 
 
 			$window.trigger('action:ajaxify.start', {
-				url: url
+				url: url,
+				tpl_url: tpl_url
 			});
 
 			collapseNavigationOnClick();
diff --git a/public/src/client/recent.js b/public/src/client/recent.js
index fc591fbb3b..5b6a4d7527 100644
--- a/public/src/client/recent.js
+++ b/public/src/client/recent.js
@@ -9,7 +9,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) {
 		newPostCount = 0;
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
-		if(data.url.indexOf('recent') !== 0) {
+		if (data.tpl_url !== 'recent') {
 			Recent.removeListeners();
 		}
 	});
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index e1d3a1a153..1d5e16ce7e 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -105,7 +105,10 @@ define('forum/topic', [
 
 	function getPostIndex() {
 		var parts = window.location.pathname.split('/');
-		return parts[parts.length - 1] ? parseInt(parts[parts.length - 1], 10) : 0;
+		if (parts[parts.length - 1] && utils.isNumber(parts[parts.length - 1])) {
+			return parseInt(parts[parts.length - 1], 10)
+		}
+		return 0;
 	}
 
 	function addBlockQuoteHandler() {