From 256733ce8161e30ae180ced22b02b7a1af3674ac Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Mon, 27 Oct 2014 22:57:07 -0600 Subject: [PATCH] Okay, works. Huh. --- app/network.js | 12 +++++++----- app/room.js | 22 +++++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/network.js b/app/network.js index c00b598..c0d64bc 100644 --- a/app/network.js +++ b/app/network.js @@ -6,16 +6,17 @@ var networks = {}; function networkConnect(network, baseURL, authtok) { var eventSource; var element = getTemplate("server-channels"); - var channels = element.getElementByClassName("channels")[0]; + var channels = element.getElementsByClassName("channels")[0]; var roomElement = element.getElementsByClassName("server")[0]; - var rooms = {".": room}; + var rooms = {".": roomElement}; newRoom(roomElement, element, network, maxScrollback); - function newRoom(name) { + function makeRoom(name) { var rElement = getTemplate("channel"); newRoom(rElement, element, name, maxScrollback); channels.appendChild(rElement); rooms[name] = rElement; + return rElement; } function handleEventSourceLine(line) { @@ -31,7 +32,7 @@ function networkConnect(network, baseURL, authtok) { var room = rooms[forum]; if (! room) { - room = newRoom(forum); + room = makeRoom(forum); } // XXX: Handle differently based on command @@ -63,7 +64,6 @@ function networkConnect(network, baseURL, authtok) { form.append("network", network); form.append("target", target); form.append("text", text); - console.log(form); var oReq = new XMLHttpRequest(); oReq.addEventListener("error", handleError); @@ -86,4 +86,6 @@ function networkConnect(network, baseURL, authtok) { eventSource = new EventSource(pullURL); eventSource.addEventListener("message", handleEventSourceMessage); eventSource.addEventListener("error", handleEventSourceError); + + document.getElementsByClassName("rooms")[0].appendChild(element); } diff --git a/app/room.js b/app/room.js index a741263..86d58bc 100644 --- a/app/room.js +++ b/app/room.js @@ -50,10 +50,12 @@ var visibleRoom; function newRoom(element, network, name, maxSize) { var messages = getTemplate("messages"); - if (! maxsize) { + var lastmsg; + if (! maxSize) { maxSize = 500; } + element.addMessage = function(timestamp, command, source, content) { var message = getTemplate("message"); @@ -61,9 +63,10 @@ function newRoom(element, network, name, maxSize) { var eSource = message.getElementsByClassName("source")[0]; var eContent = message.getElementsByClassName("content")[0]; - message.nodeList.add(command); - if (source = ".") { - message.nodeList.add("self"); + message.classList.add("update"); + message.classList.add(command); + if (source == ".") { + message.classList.add("self"); } eTimestamp.textContent = timestamp.toLocaleTimeString(); @@ -77,14 +80,16 @@ function newRoom(element, network, name, maxSize) { messages.removeChild(element.firstChild); } + lastmsg = message; + if (visibleRoom == element) { - message.scrollIntoView(false); + lastmsg.scrollIntoView(false); } } element.hide = function() { element.classList.remove("selected"); - messages.classList.add("hidden"); + messages.style.display = "none"; } element.show = function() { @@ -92,7 +97,8 @@ function newRoom(element, network, name, maxSize) { visibleRoom.hide() } element.classList.add("selected"); - messages.classList.remove("hidden"); + messages.style.display = null; + lastmsg.scrollIntoView(false); visibleRoom = element; } @@ -109,5 +115,7 @@ function newRoom(element, network, name, maxSize) { element.addEventListener("click", clicked); element.getElementsByClassName("content-item")[0].textContent = name; + document.getElementById("messages-container").appendChild(messages); + return element; } \ No newline at end of file