Merge branch 'one-hour-one-life' of github.com:Dallinger/Griduniverse…

… into issue/238-multi-participant-trans

dlgr/griduniverse/config.txt

@@ -11,6 +11,7 @@ rows = 100
 window_rows = 20
 window_columns = 20
 use_identicons = true
+show_chatroom = true
 
 [HIT Configuration]
 title = Griduniverse

dlgr/griduniverse/static/scripts/demo.js

@@ -756,10 +756,17 @@ function bindGameKeys(socket) {
     }
   }
 
+  function isChatting() {
+    return $("#message").is(':focus');
+  }
+
   directions.forEach(function(direction) {
     Mousetrap.bind(
       direction,
       function(e) {
+        if (isChatting()) {
+          return;
+        }
         e.preventDefault();
         if (direction === lastDirection) {
           return;
@@ -780,6 +787,9 @@ function bindGameKeys(socket) {
     Mousetrap.bind(
       direction,
       function(e) {
+        if (isChatting()) {
+          return;
+        }
         e.preventDefault();
         if (direction) {
           clearInterval(repeatIntervalId);
@@ -791,7 +801,11 @@ function bindGameKeys(socket) {
 
   });
 
-  Mousetrap.bind("space", function () {
+  Mousetrap.bind("space", function (e) {
+    if (isChatting()) {
+      return;
+    }
+    e.preventDefault();
     var msg_type;
     var ego = players.ego();
     var position = ego.position;
@@ -832,7 +846,11 @@ function bindGameKeys(socket) {
     socket.send(msg);
   });
 
-  Mousetrap.bind("d", function () {
+  Mousetrap.bind("d", function (e) {
+    if (isChatting()) {
+      return;
+    }
+    e.preventDefault();
     var ego = players.ego();
     var position = ego.position;
     var currentItem = ego.currentItem;
@@ -1428,7 +1446,7 @@ $(document).ready(function() {
     return Math.floor(pix / (settings.block_size + settings.padding));
   };
 
-  $("form").submit(function() {
+  $("form").on('submit', function() {
     var chatmessage = $("#message").val().trim(),
         msg;