Don't auto scroll the window if the user has scrolled up

juju2143 · Mar 25, 2015 · cc6db27 · cc6db27
1 parent 66a2c9d
commit cc6db27
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -103,7 +103,14 @@ io.on('connection', function(socket)
           socket.emit(rows[i].type,rows[i]);
         }
       }
-      socket.emit('scroll',"");
+      if(data.lines > 1)
+      {
+        socket.emit('scrollforce',"");
+      }
+      else
+      {
+        socket.emit('scroll',"");
+      }
     });
 
     connection.query('SELECT * FROM irc_channels WHERE chan = ?', [config.channel], function(err, rows, fields)

diff --git a/public/main.js b/public/main.js
@@ -198,6 +198,12 @@ socket.on('topics', function(data)
 });
 
 socket.on('scroll', function(data)
+{
+  if($(document).height()-$(document).scrollTop()-$(window).height() <= $("#messages tr:last").height()+1)
+    scroll();
+});
+
+socket.on('scrollforce', function(data)
 {
   scroll();
 });
@@ -337,6 +343,7 @@ $("#send").click(function(e)
       socket.emit('message', {message: message, auth: auth, action: 0});      
     }
     $("#inputmsg").val("");
+    scroll();
   }
 });