Fixed: sending messages on emoji completer with enter key refs #160

codefirst · Jan 3, 2014 · 077572b · 077572b
1 parent 1106176
commit 077572b
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
@@ -83,16 +83,17 @@ $(function() {
 
     $('form.inputarea').bind('submit', function(e){
         var textcompleting = $(".dropdown-menu").is(":visible");
-
-        if(connected && !textcompleting) {
-            e.preventDefault();
-            jQuery.post(AsakusaSatellite.url.create, {
-                'room_id' : AsakusaSatellite.current.room,
-                'message' : $('textarea#message').val()
-            });
-            $('textarea#message').val('');
-        } else if (e.target == $('textarea#message').get(0)) {
-          this.submit();
+        if (!textcompleting) {
+          if (connected) {
+              e.preventDefault();
+              jQuery.post(AsakusaSatellite.url.create, {
+                  'room_id' : AsakusaSatellite.current.room,
+                  'message' : $('textarea#message').val()
+              });
+              $('textarea#message').val('');
+          } else if (e.target == $('textarea#message').get(0)) {
+            this.submit();
+          }
         }
     });