formatted output

[mudsync.git] / data / web-static / js / mudsync.js

diff --git a/data/web-static/js/mudsync.js b/data/web-static/js/mudsync.js
index 1a08b47178142d7b148cc02362ebc5c4801efa9c..631fa89e0f1c6e7ec672f16ca5bd218f61d5aeff 100644 (file)
--- a/data/web-static/js/mudsync.js
+++ b/data/web-static/js/mudsync.js
@@ -18,18 +18,21 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-function displayMessage(data) {
+function displayMessage(data, self_sent) {
     var new_entry = document.createElement("div");
-    var new_text = document.createTextNode(data);
     var stream_metabox = document.getElementById("stream-metabox");
     var should_scroll = false;
     if(stream_metabox.scrollTop === (stream_metabox.scrollHeight
                                      - stream_metabox.offsetHeight)) {
         should_scroll = true;
     }
-    document.getElementById("main-input").value = "";
-    new_entry.setAttribute("class", "stream-entry");
-    new_entry.appendChild(new_text);
+    if (self_sent) {
+        new_entry.setAttribute("class", "stream-entry self-sent");
+        document.getElementById("main-input").value = "";
+    } else {
+        new_entry.setAttribute("class", "stream-entry");
+    }
+    new_entry.innerHTML = data;
     document.getElementById("stream").appendChild(new_entry);
     if (should_scroll) {
         stream_metabox.scrollTop = stream_metabox.scrollHeight;
@@ -38,13 +41,13 @@ function displayMessage(data) {
 
 function installWebsocket() {
     // TODO: Don't hardcode the websocket path; pull it from the DOM
-    var ws = new WebSocket("ws://127.0.0.1:8888");
+    var address = "ws://".concat(window.location.hostname, ":", window.location.port);
+    var ws = new WebSocket(address);
     ws.onmessage = function(evt) {
-        displayMessage(evt.data);
+        displayMessage(evt.data, false);
     };
     ws.onopen = function() {
         console.log("connected");
-        ws.send("Hello, there!");
     };
     ws.onclose = function () {
         console.log("closed websocket");
@@ -58,7 +61,9 @@ function installUIHooks(ws) {
         if (!e) e = window.event;
         var keyCode = e.keyCode || e.which;
         if (keyCode == '13') {
-            sendMessageToServer(ws, input.value);
+            var input_val = input.value;
+            displayMessage("> ".concat(input_val), true);
+            sendMessageToServer(ws, input_val);
         }
     }
 }