From 8288534cf6ba3c5521ccde667954ab697716062e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 17 Mar 2011 23:18:44 +0000
Subject: [PATCH] Fixed a firefox-incompatability bug in the webclient.
 Resolves issue143.

---
 src/web/media/javascript/evennia_webclient.js | 14 ++++++++++----
 src/web/templates/prosimii/webclient.html     |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/web/media/javascript/evennia_webclient.js b/src/web/media/javascript/evennia_webclient.js
index d81c89437c..184664618b 100644
--- a/src/web/media/javascript/evennia_webclient.js
+++ b/src/web/media/javascript/evennia_webclient.js
@@ -192,7 +192,8 @@ function history_add(input) {
 // Catching keyboard shortcuts
 
 $(document).keypress( function(event) {
-    var code = event.keyCode ? event.keyCode : event.which;
+    var code = event.keyCode ? event.keyCode : event.which;    
+    wresult = event.which;
 
     // always focus input field
     $("#inputfield")[0].focus();
@@ -202,12 +203,17 @@ $(document).keypress( function(event) {
         return false;
     }
     else {
-        if (code == 38) { // arrow up
-            $("#inputfield").val(function(index, value){
+        if (wresult == 38 || wresult == 40) {
+            // this fixes a bug in firefox, those are on ASCII format
+            return false;
+        }
+
+        if (code == 38) { // arrow up 38
+            $("#inputfield").val(function(index, value){                
                 return history_step_back();
             });
         }
-        else if (code == 40) { // arrow down
+        else if (code == 40) { // arrow down 40
             $("#inputfield").val(function(index, value){
                 return history_step_fwd();
             });
diff --git a/src/web/templates/prosimii/webclient.html b/src/web/templates/prosimii/webclient.html
index aa1bcc7e24..85f25d56d2 100644
--- a/src/web/templates/prosimii/webclient.html
+++ b/src/web/templates/prosimii/webclient.html
@@ -38,7 +38,7 @@
       </div>
       <form id="inputform">
         <div id="playercount">Logged in Players: {{num_players_connected}}</div>
-        <div id="inputcontrol"><input type="text" id="inputfield" autocomplete="off"><input id="inputsend" type="button" value="send" onClick="sendMsg()" /></div>
+        <div id="inputcontrol"><input type="text" id="inputfield" autocomplete="off"><input id="inputsend" type="button" value="send" onClick="webclient_input()" /></div>
       </form>
     </div>