Merge branch 'master' of github.com:sdelements/lets-chat into develop

sdelements · Jun 4, 2015 · e7c8584 · e7c8584
2 parents 6c526e8 + 44ab0a3
commit e7c8584
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,3 +11,6 @@ RUN	groupadd -r node \
 USER node
 
 EXPOSE 5000
+EXPOSE 5222
+
+VOLUME [ "/usr/src/app/uploads" ]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,10 +8,13 @@ app:
   build: .
   links:
     - db
-  environment:
-    - LCB_DATABASE_URI=mongodb://db/letschat
   ports:
     - 5000:5000
+    - 5222:5222
+  environment:
+    - LCB_DATABASE_URI=mongodb://db/letschat
+    - LCB_XMPP_ENABLE=true
+    - LCB_XMPP_PORT=5222
 
 # Mongo Database
 db:

diff --git a/media/js/views/room.js b/media/js/views/room.js
@@ -354,6 +354,8 @@
                 text: $textarea.val()
             });
             $textarea.val('');
+            this.scrollLocked = true;
+            this.scrollMessages();
         },
         addMessage: function(message) {
             // Smells like pasta