Merge pull request #4374 from boomzillawtf/master

Setting to show new post after reply

public/language/en_GB/user.json

@@ -103,6 +103,8 @@
 	"enable_topic_searching": "Enable In-Topic Searching",
 	"topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
 
+	"scroll_to_my_post": "After posting a reply, show the new post",
+
 	"follow_topics_you_reply_to": "Follow topics that you reply to",
 	"follow_topics_you_create": "Follow topics you create",
 

public/src/client/topic/posts.js

@@ -33,11 +33,13 @@ define('forum/topic/posts', [
 		ajaxify.data.postcount ++;
 		postTools.updatePostCount(ajaxify.data.postcount);
 
+		if (config.scrollToMyPost) {
 		  if (config.usePagination) {
 			  onNewPostPagination(data);
 		  } else {
 			  onNewPostInfiniteScroll(data);
 		  }
+		}
 	};
 
 	function updatePostCounts(posts) {

src/user/settings.js

@@ -76,6 +76,7 @@ module.exports = function(User) {
 			settings.restrictChat = parseInt(getSetting(settings, 'restrictChat', 0), 10) === 1;
 			settings.topicSearchEnabled = parseInt(getSetting(settings, 'topicSearchEnabled', 0), 10) === 1;
 			settings.bootswatchSkin = settings.bootswatchSkin || 'default';
+			settings.scrollToMyPost = parseInt(getSetting(settings, 'scrollToMyPost', 1), 10) ===1;
 
 			callback(null, settings);
 		});
@@ -120,7 +121,8 @@ module.exports = function(User) {
 			restrictChat: data.restrictChat,
 			topicSearchEnabled: data.topicSearchEnabled,
 			groupTitle: data.groupTitle,
-			homePageRoute: data.homePageCustom || data.homePageRoute
+			homePageRoute: data.homePageCustom || data.homePageRoute,
+			scrollToMyPost: data.scrollToMyPost
 		};
 
 		if (data.bootswatchSkin) {