1 files changed, 39 insertions, 9 deletions

diff --git a/js/treeview.js b/js/treeview.js
index 78ad620b..1709debb 100644
--- a/js/treeview.js
+++ b/js/treeview.js
@@ -11,14 +11,28 @@
  *
  */
 
-if (active_page == 'thread')
+if (active_page == 'thread' || active_page == 'ukko' || active_page == 'index')
 $(function() {
-        $('hr:first').before('<div id="treeview" style="text-align:right"><a class="unimportant" href="javascript:void(0)"></a></div>');
-        $('div#treeview a')
-                .text(_('Tree view'))
-                .click(function(e) {
-			e.preventDefault();
+	if (window.Options && Options.get_tab('general')) {
+		var selector = '#treeview-global>input';
+		Options.extend_tab("general", "<label id='treeview-global'><input type='checkbox' /> "+_('Use tree view by default')+"</label>");
+		$(selector).on('change', function() {
+			if (localStorage.treeview === 'true') {
+				localStorage.treeview = 'false';
+			} else {
+				localStorage.treeview = 'true';
+			}
+		});
+		if (localStorage.treeview === 'true') {
+			$(selector).attr('checked', 'checked');
+		}
+	}
+});
 
+if (active_page == 'thread')
+$(function() {
+	var treeview = function(enable) {
+		if (enable === true) {
 			$('.post.reply').each(function(){
 				var references = [];
 				$(this).find('.body a').each(function(){
@@ -26,7 +40,6 @@ $(function() {
 						references.push(parseInt($(this).html().replace('&gt;&gt;', '')));
 					}
 				});
-
 				var maxref = references.reduce(function(a,b) { return a > b ? a : b; }, 0);
 
 				var parent_post = $("#reply_"+maxref);
@@ -39,7 +52,24 @@ $(function() {
 
 				post.detach().css("margin-left", margin).insertAfter(parent_post.next());
 				br.detach().insertAfter(post);
-
 			});
-		});
+		} else {
+			$('.post.reply').sort(function(a,b) {
+				return parseInt(a.id.replace('reply_', '')) - parseInt(b.id.replace('reply_', ''));
+			}).each(function () {
+				var post = $(this);
+				var br = post.next();
+				post.detach().css('margin-left', '').appendTo('.thread');
+				br.detach().insertAfter(post);
+			});
+		}
+	}
+
+	$('hr:first').before('<div class="unimportant" style="text-align:right"><label for="treeview"><input type="checkbox" id="treeview"> '+_('Tree view')+'</label></div>');
+	$('input#treeview').on('change', function(e) { treeview($(this).is(':checked')); });
+
+	if (localStorage.treeview === 'true') {
+		treeview(true);
+		$('input#treeview').attr('checked', true);
+	}
 });