Fixed the send button in the webclient; made the prompt command work with the webclient (still not displaying correctly)

evennia/server/portal/webclient.py

@@ -156,10 +156,12 @@ class WebSocketClient(Protocol, Session):
             text = args[0]
             if text is None:
                 return
+        else:
+            return
         flags = self.protocol_flags
         text = to_str(text, force_string=True)
 
-        options = kwargs.get("options", {})
+        options = kwargs.pop("options", {})
         raw = options.get("raw", False)
         nomarkup = options.get("nomarkup", False)
         screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
@@ -174,6 +176,7 @@ class WebSocketClient(Protocol, Session):
             args[0] = text
         else:
             args[0] = parse_html(text, strip_ansi=nomarkup)
+        print "send_text:", cmd, args, kwargs
 
         # send to client on required form [cmdname, args, kwargs]
         self.sendLine(json.dumps([cmd, args, kwargs]))

evennia/web/webclient/static/webclient/js/webclient_gui.js

@@ -190,11 +190,11 @@ function onText(args, kwargs) {
 // Handle prompt output from the server
 function onPrompt(args, kwargs) {
     // show prompt
-    $('prompt').replaceWith(
-           "<div id='prompt' class='msg out'>" + args[0] + "</div>");
+    $('#prompt').replaceWith(
+           "<div id='prompt'>" + args[0] + "</div>");
 }
 
-// Handle silencing events we don't do anything with.
+// Silences events we don't do anything with.
 function onSilence(cmdname, args, kwargs) {}
 
 // Handle unrecognized commands from server
@@ -224,6 +224,9 @@ $(document).keydown(onKeydown)
     .bind("paste", resizeInputField)
     .bind("cut", resizeInputField);
 
+// Pressing the send button
+$("#inputsend").bind("click", doSendText);
+
 // Event when client finishes loading
 $(document).ready(function() {
     // This is safe to call, it will always only
@@ -237,6 +240,8 @@ $(document).ready(function() {
     Evennia.emitter.on("connection_open", onSilence);
     Evennia.emitter.on("connection_close", onSilence);
 
+    // Handle pressing the send button
+    $("#inputsend").bind("click", doSendText);
     // Event when closing window (have to have Evennia initialized)
     $(window).bind("beforeunload", Evennia.connection.close);
 

evennia/web/webclient/templates/webclient/webclient.html

@@ -15,7 +15,7 @@
         <div id="prompt"></div>
         <div id="inputcontrol">
             <textarea id="inputfield" type="text"></textarea>
-            <input id="inputsend" type="button" onClick="doSendText()" value="&gt;"/>
+            <input id="inputsend" type="button" value="&gt;"/>
         </div>
     </div>
     <div id="inputsizer"></div>