diff --git a/pages/css/style.css b/pages/css/style.css
index ccb3f05..12d3ad7 100644
--- a/pages/css/style.css
+++ b/pages/css/style.css
@@ -62,4 +62,20 @@ body {
html, body {
height: 100%;
margin: 0;
+}
+
+#conversations
+{
+ width: 20%;
+ float: left;
+}
+
+#conversation
+{
+
+}
+
+#unreadmsg
+{
+ background-color: #DDD;
}
\ No newline at end of file
diff --git a/pages/index.html b/pages/index.html
index d849e7b..446f905 100644
--- a/pages/index.html
+++ b/pages/index.html
@@ -1,7 +1,8 @@
+
Chat
-
+
@@ -9,84 +10,87 @@
-
+
+
-
-
-
\ No newline at end of file
diff --git a/pages/js/index.js b/pages/js/index.js
index 9c39251..121ccb3 100644
--- a/pages/js/index.js
+++ b/pages/js/index.js
@@ -3,13 +3,32 @@
*/
$(document).ready(function () {
+ conversationChanged();
+});
+
+function conversationChanged() {
var cmsgs = document.getElementById("channelmessages");
if (cmsgs != null && cmsgs.childElementCount > 0) {
- var nodes = cmsgs.children;
+ var nodes = cmsgs.getElementsByClassName("chmessage");
for (var x = 0; x < nodes.length; x++) {
var item = nodes[x];
- if (item.tagName == "DIV")
- handlereceivedmessage(item);
+ handlereceivedmessage(item);
}
}
-});
+ if (document.getElementById("convidp").innerText == "-1") {
+ document.getElementById("msginput").style.display = "none";
+ stopPoll();
+ }
+ else {
+ document.getElementById("msginput").style.display = "block";
+ startPoll();
+ }
+}
+
+function changeConversation(convid) {
+ var convidp = document.getElementById("convidp");
+ if (convidp.innerText == convid + "")
+ return;
+ convidp.innerText = convid;
+ conversationChanged();
+}
diff --git a/pages/js/receivemessage.js b/pages/js/receivemessage.js
index 27cace9..962e598 100644
--- a/pages/js/receivemessage.js
+++ b/pages/js/receivemessage.js
@@ -23,9 +23,9 @@ var updateUnreadCount = function () {
var msgs = document.getElementById("channelmessages").getElementsByClassName("chmessage");
for (var i = msgs.length - 1; i >= 0; i--) {
if (i >= msgs.length - unreadCount)
- msgs[i].style.backgroundColor = "darkgray";
+ msgs[i].classList.add("unreadmsg");
else
- msgs[i].style = "";
+ msgs[i].classList.remove("unreadmsg");
updatemsgtime(msgs[i]);
}
};
@@ -40,29 +40,49 @@ var resetUnread = function resetUnread() {
updateUnreadCount();
};
+var shouldpoll = false;
+function poll() {
+ setTimeout(function () {
+ if (!shouldpoll)
+ return;
+ $.ajax({
+ url: "/receivemessage", data: document.getElementById("convidp").innerText, success: function (data) {
+ var msgs = document.getElementById("channelmessages");
+ msgs.innerHTML += data;
+ var msgelement = msgs.children[msgs.children.length - 1];
+ handlereceivedmessage(msgelement);
+ if (justsentmsgread)
+ justsentmsgread = false;
+ else
+ addUnread();
+ }, error: function (data) {
+ if (data.responseText) {
+ if (data.responseText.indexOf("ERROR") == -1)
+ showError(data.responseText);
+ else
+ console.log("Got empty string error...");
+ }
+ else
+ showError("Can't connect to the server!");
+ }, dataType: "text", complete: poll, method: "POST"
+ });
+ }, 100);
+};
+
+function startPoll() {
+ if (!shouldpoll) {
+ shouldpoll = true;
+ poll();
+ }
+}
+
+function stopPoll() {
+ shouldpoll = false;
+}
+
var readTimer = null;
$(document).ready(function () {
$('#msginput').on("focus", function () { readTimer == null ? readTimer = setTimeout(function () { resetUnread(); }, 3000) : readTimer; });
$('#msginput').on("keydown", resetUnread);
$('#msginput').on("blur", function () { readTimer != null ? clearTimeout(readTimer) : readTimer; });
-
- if (isLoggedIn())
- (function poll() {
- setTimeout(function () {
- $.ajax({
- url: "/receivemessage", success: function (data) {
- var msgs = document.getElementById("channelmessages");
- msgs.innerHTML += data;
- var msgelement = msgs.children[msgs.children.length - 1];
- handlereceivedmessage(msgelement);
- if (justsentmsgread)
- justsentmsgread = false;
- else
- addUnread();
- }, error: function (data) {
- showError(data.responseText);
- }, dataType: "text", complete: poll
- });
- }, 100);
- })();
});
diff --git a/pages/js/sendmessage.js b/pages/js/sendmessage.js
index d311bdf..313961f 100644
--- a/pages/js/sendmessage.js
+++ b/pages/js/sendmessage.js
@@ -38,9 +38,12 @@ var sendmsgonenter = function sendmsgonenter(e) {
var textarea = e.target;
if (textarea.value.trim().length == 0)
return;
- textarea.disabled = true; //msginput
- window.convid = document.getElementById("convidp").innerText * 1;
- sendmsg(textarea);
+ var convidp = document.getElementById("convidp");
+ if (convidp != null) {
+ textarea.disabled = true; //msginput
+ window.convid = convidp.innerText * 1;
+ sendmsg(textarea);
+ }
};
$(document).ready(function () {
diff --git a/src/io/github/norbipeti/chat/server/data/LoaderCollection.java b/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
index a86476d..9352b6b 100644
--- a/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
+++ b/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
@@ -88,13 +88,26 @@ public class LoaderCollection