Fix scrolling

snavebaby · Mar 2, 2018 · 503d7bb · 503d7bb
1 parent bcfed0c
commit 503d7bb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/index.html b/index.html
@@ -61,12 +61,15 @@ <h2>Chatify - A realtime socket based chat app</h2>
                                 <div class="chat-message-form">
                                     <div class="form-group">
                                         <form action="">
-                                            <textarea class="form-control message-input"
-                                                      autocomplete="off"
-                                                      id="m"
-                                                      name="message"
-                                                      placeholder="Enter message text"></textarea>
-                                            <button class="btn btn-warning" type="submit">Send</button>
+                                            <input
+                                                    type="text"
+                                                    class="form-control message-input"
+                                                    autocomplete="off"
+                                                    id="message"
+                                                    name="message"
+                                                    placeholder="Enter message text"/>
+
+                                            <button class="btn btn-warning pull-right m-r-sm m-t-sm" type="submit">Send</button>
                                         </form>
                                     </div>
                                 </div>
@@ -96,7 +99,7 @@ <h2>Chatify - A realtime socket based chat app</h2>
 <script type="text/javascript" src="/socket.io/socket.io.js"></script>
 
 <!--Application scripts-->
-<script type="text/javascript" src="/js/chatify-socket.js"></script>
+<script type="text/javascript" src="/js/chatify.js"></script>
 
 
 </body>

diff --git a/public/js/chatify-socket.js → public/js/chatify.js b/public/js/chatify-socket.js → public/js/chatify.js
@@ -1,8 +1,8 @@
 $(document).ready(function () {
     var socket = io();
     $('form').submit(function () {
-        socket.emit('send-message', $('#m').val());
-        $('#m').val('');
+        socket.emit('send-message', $('#message').val());
+        $('#message').val('');
         return false;
     });
 
@@ -30,7 +30,9 @@ $(document).ready(function () {
             
             `
         );
-        window.scrollTo(0, document.body.scrollHeight);
+
+        var messages = document.getElementById('messages');
+        messages.scrollTop = messages.scrollHeight;
     });
 
     socket.on('update-users', function (data) {