From e6c1ab3df82095da2f703e7627856ac39c7812f4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 15 Jun 2014 23:14:06 +0200
Subject: [PATCH] First make of a testing method for oob

---
 src/web/media/javascript/evennia_websocket_webclient.js | 9 +++++++--
 src/web/templates/prosimii/webclient.html               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/web/media/javascript/evennia_websocket_webclient.js b/src/web/media/javascript/evennia_websocket_webclient.js
index b58c60592..17d7c50f1 100644
--- a/src/web/media/javascript/evennia_websocket_webclient.js
+++ b/src/web/media/javascript/evennia_websocket_webclient.js
@@ -50,7 +50,7 @@ function onMessage(evt) {
     var inmsg = evt.data
     if (inmsg.length > 3 && inmsg.substr(0, 3) == "OOB") {
         // dynamically call oob methods, if available
-        try {var oobtuples = JSON.parse(inmsg.slice(3));} // everything after OOB }
+        try {var oobtuples = JSON.parse(inmsg.slice(4));} // everything after OOB }
         catch(err) {
             // not JSON packed - a normal text
             msg_display('out', inmsg);
@@ -76,7 +76,12 @@ function doSend(){
     history_add(outmsg);
     HISTORY_POS = 0;
     $('#inputform')[0].reset();                     // clear input field
-    websocket.send(outmsg);
+
+    if (outmsg.length > 4 && outmsg.substr(0, 5) == "##OOB") {
+        // test OOB messaging
+        doOOB(JSON.parse(outmsg.slice(5))); }
+    else {
+        websocket.send(outmsg); }
 }
 
 function doOOB(ooblist){
diff --git a/src/web/templates/prosimii/webclient.html b/src/web/templates/prosimii/webclient.html
index b0d815170..ba7769af2 100644
--- a/src/web/templates/prosimii/webclient.html
+++ b/src/web/templates/prosimii/webclient.html
@@ -51,7 +51,7 @@
       </div>
       <form id="inputform" action="javascript:void(0);">
         <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="doSend()" /></div>
+        <div id="inputcontrol"><input type="text" id="inputfield" autocomplete="off"><input id="inputsend" type="button" value="send" onClick="doSend()"/></div>
       </form>
     </div>