X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/16f7340b1fdda0273a3a28656b5c4cba99583371..f9e5ee8293ff86dd9d2026d66c12bd5881fde6e3:/webclient/rc.html?ds=inline diff --git a/webclient/rc.html b/webclient/rc.html index df592d0..7689e4b 100644 --- a/webclient/rc.html +++ b/webclient/rc.html @@ -47,6 +47,7 @@ width: 100%; position: fixed; bottom: 0; + display: none; } #input { width: 100%; @@ -61,6 +62,18 @@ font-size: 85%; text-align: right; } + .status { + color: #dd8; + } + .local.self { + color: #d8d; + } + .self { + color: #8d8; + } + .me { + color: #bbd; + } .servercount { margin-right: -0.5em; font-size: 70%; @@ -100,6 +113,10 @@ padding-left: 5px; padding-right: 5px; } + #getnick { + padding-left: 3em; + display: none; + } /* BEGIN expando input box trick kindly provided by http://www.alistapart.com/articles/expanding-text-areas-made-elegant/ */ .expandingArea { @@ -152,7 +169,7 @@ var session = Math.random(); // For outgoing message IDs var since = {}; // server -> time: For fetch?since= var seen = {}; // seen_key -> message - var history = []; // List of messages sorted by Time + var hist = []; // List of messages sorted by Time // Messages have these fields: // Time: The timestamp. Median of ServerTimes // ID: Some unique string for deduping @@ -161,11 +178,7 @@ // UI: The DOM node for this message in the UI function rcnick() { - var nick = localStorage.getItem("nick"); - if (nick) { - return nick; - } - return 'anonymous'; + return localStorage.getItem("nick"); } function rcsetnick(new_nick) { @@ -258,6 +271,8 @@ type = "status"; } else if (/^\* /.test(message.Text)) { type = "me"; + } else if (/^-!- /.test(message.Text)) { + type = "local"; } else { type = "text"; } @@ -292,19 +307,19 @@ function rcaddmessagetohistory(message) { var message_i; if (message.Time) { - for (var i = history.length - 1; ; i--) { - if (i < 0 || (history[i].Time && message.Time >= history[i].Time)) { + for (var i = hist.length - 1; ; i--) { + if (i < 0 || (hist[i].Time && message.Time >= hist[i].Time)) { message_i = i+1; - history.splice(message_i, 0, message); + hist.splice(message_i, 0, message); break; } } } else { - history.push(message); - message_i = history.length-1; + hist.push(message); + message_i = hist.length-1; } - if (message_i + 1 < history.length) { - rcaddmessagetoUI(message, history[message_i + 1].UI); + if (message_i + 1 < hist.length) { + rcaddmessagetoUI(message, hist[message_i + 1].UI); } else { rcaddmessagetoUI(message, null); } @@ -342,11 +357,11 @@ message.Time = new Date(times[middle-1].getTime() + difference/2); } - // This may have broken history's in-sorted-order invariant - var hi = history.indexOf(message); - if ((history[hi-1] && history[hi-1].Time > message.Time) || - (history[hi+1] && history[hi+1].Time < message.Time)) { - history.splice(hi,1); + // This may have broken hist's in-sorted-order invariant + var hi = hist.indexOf(message); + if ((hist[hi-1] && hist[hi-1].Time > message.Time) || + (hist[hi+1] && hist[hi+1].Time < message.Time)) { + hist.splice(hi,1); rcaddmessagetohistory(message); } @@ -427,6 +442,15 @@ } } + function rcstart() { + if (rcnick()) { + document.getElementById("client").style.display = 'block'; + rcconnect(); + } else { + document.getElementById("getnick").style.display = 'block'; + } + } + function rcsend(d, message) { message.ID = new Date().getTime() + "-" + session + "-" + Math.random(); seen[make_seen_key(message.ID, message.Text)] = message; @@ -434,25 +458,35 @@ "?id=" + encodeURIComponent(message.ID) + "&text=" + encodeURIComponent(message.Text); for (var i in servers) { - var uri = rcserverbase(servers[i]) + path; - var img = document.createElement("img"); - img.setAttribute("src", uri); - d.appendChild(img); + var xhr = new XMLHttpRequest(); + xhr.open("POST", rcserverbase(servers[i]) + path); + xhr.send(); } } function rcinput(input) { var message; - var re = /^\/([a-z]+) (.*)/ + var re = /^\/(\S+)(\s(.*))?/; var match = re.exec(input); if (match) { - if (match[1] == 'me') { - message = "* " + rcnick() + " " + match[2]; - } else if (match[1] == 'nick') { - message = "*** " + rcnick() + " is now known as " + match[2]; - rcsetnick(match[2]); + var command = match[1]; + var rest = match[3]; + if (command == 'me') { + message = "* " + rcnick() + " " + rest; + } else if (command == 'nick') { + if (rcnick() == rest) { + rcaddmessagetoUI({'Text': '-!- Your nick is already ' + rcnick(), 'ServerTimes': {}}); + return; + } + if (rest) { + message = "*** " + rcnick() + " is now known as " + rest; + rcsetnick(rest); + } else { + rcaddmessagetoUI({'Text': '-!- /nick requires an argument', 'ServerTimes': {}}); + return; + } } else { - rcaddmessagetoUI({'Text': '-!- No such command: ' + match[1], 'ServerTimes': {}}); + rcaddmessagetoUI({'Text': '-!- No such command: ' + command, 'ServerTimes': {}}); return; } } else { @@ -466,12 +500,24 @@ function rckeydown(event) { if (event.keyCode == 13) { - rcinput(document.input.say.value); + if (document.input.say.value) { + rcinput(document.input.say.value); + } document.input.say.value = ""; return false; } } + function rcsetinitialnick() { + if (document.getnickform.initial_nick.value) { + rcsetnick(document.getnickform.initial_nick.value); + document.getElementById("getnick").style.display = 'none'; + document.getElementById("client").style.display = 'block'; + rcconnect(); + } + return false; + } + // From http://www.alistapart.com/articles/expanding-text-areas-made-elegant/ function makeExpandingArea(container) { var area = container.querySelector('textarea'); @@ -498,13 +544,20 @@ - +
+
+

Set your nick

+
+ + +
+