From 8a471e590a38c0b453d00ae474e729b72cb2b7c1 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 11 Jul 2012 22:30:03 +0200
Subject: [PATCH 1/3] Fix #581 Don't scroll chat automatically if user is not
 at the bottom

---
 src/static/js/chat.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index b2a7d2737..28ceda975 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -62,9 +62,10 @@ var chat = (function()
     },
     scrollDown: function()
     {
-      if($('#options-scrollchat').is(':checked')){
-        if($('#chatbox').css("display") != "none"){
+      if($('#chatbox').css("display") != "none"){
+        if(!self.lastMessage || self.lastMessage.position().top < $('#chattext').height()) {
           $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
+          self.lastMessage = $('#chattext > p').eq(-1);
         }
       }
     }, 

From 7653db36fe0cb362f6775ba8be76440e4bb72585 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 12 Jul 2012 10:23:55 +0200
Subject: [PATCH 2/3] Revert "option to stop autoscroll"

This reverts commit 6726ea66320e3075451027d5362d35d77bebaf5d.

Conflicts:

	src/static/js/chat.js
---
 src/templates/pad.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index a25133472..02af9b107 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -168,10 +168,6 @@
                     <input type="checkbox" id="options-linenoscheck" checked>
                     <label for="options-linenoscheck">Line numbers</label>
                 </p>
-                <p>
-                    <input type="checkbox" id="options-scrollchat" checked>
-                    <label for="options-scrollchat">Automatically Scroll Chat</label>
-                </p>
                 <p>
                     Font type:
                     <select id="viewfontmenu">

From f12cb0dd58c98cd08f3c30b4a21d9e7289d5414e Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 12 Jul 2012 10:34:11 +0200
Subject: [PATCH 3/3] Don't screw up, if chat is empty.

---
 src/static/js/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 28ceda975..18904352f 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -63,7 +63,7 @@ var chat = (function()
     scrollDown: function()
     {
       if($('#chatbox').css("display") != "none"){
-        if(!self.lastMessage || self.lastMessage.position().top < $('#chattext').height()) {
+        if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < $('#chattext').height()) {
           $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
           self.lastMessage = $('#chattext > p').eq(-1);
         }