From 652497ad57244bf2535204c44a074633a76c337a Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Thu, 26 Feb 2015 02:07:22 +0000
Subject: [PATCH] Merge

---
 inc/instance-config.php |  1 +
 js/auto-scroll.js       | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 js/auto-scroll.js

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 41407f0b..1d3a9df9 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -144,6 +144,7 @@
 	$config['additional_javascript'][] = 'js/flag-previews.js';
 	$config['additional_javascript'][] = 'js/post-filter.js';
 	$config['additional_javascript'][] = 'js/image-hover.js';
+	$config['additional_javascript'][] = 'js/auto-scroll.js';
 
 	//$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';
 	
diff --git a/js/auto-scroll.js b/js/auto-scroll.js
new file mode 100644
index 00000000..b8343f5e
--- /dev/null
+++ b/js/auto-scroll.js
@@ -0,0 +1,27 @@
+$('document').ready(function () {
+	var autoScroll = localStorage['autoScroll'] ? true : false;
+	if (window.Options && Options.get_tab('general')){
+		Options.extend_tab('general','<label id=\'autoScroll\'><input type=\'checkbox\' />' + ' Scroll to new posts' + '</label>');
+		$('#autoScroll').find('input').prop('checked', autoScroll);
+	}
+	$('#autoScroll').on('change', function() {
+		if(autoScroll) {
+			delete localStorage.autoScroll;
+		} else {
+			localStorage.autoScroll = true;
+		}
+		autoScroll =! autoScroll
+		if(active_page == 'thread')
+			$('input.auto-scroll').prop('checked', autoScroll);
+	});
+	if (active_page == 'thread') {
+		$('span[id="updater"]').children('a').after(' (<input class="auto-scroll" type="checkbox"></input> Scroll to New posts)');
+		$('input.auto-scroll').prop('checked', autoScroll);
+		$(document).on('new_post', function (e, post) {
+			if ($('input.auto-scroll').prop('checked')) 
+			{
+				scrollTo(0, $(post).offset().top - window.innerHeight + $(post).outerHeight(true)); 
+			}
+		});
+	}
+});