summaryrefslogtreecommitdiffstats
path: root/pages
diff options
context:
space:
mode:
Diffstat (limited to 'pages')
-rw-r--r--pages/chat.php30
1 files changed, 23 insertions, 7 deletions
diff --git a/pages/chat.php b/pages/chat.php
index 992d600..a1870a6 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -77,6 +77,11 @@ function getChatDone(data) {
chat.displayName = 'SERVER'
}
+ if (chat.isJoinLeave == 'true') {
+ console.log('IsJoin Leave!')
+ //return true;
+ }
+
//Message is legitmently new or a server message?
if (chat.ID > lastID || typeof(chat.ID) == 'undefined') {
addChatMessage(chat.displayName, chat.message, postDate, isSelf, isServer, chat.wallColor, chat.wallEmblem,
@@ -283,12 +288,11 @@ function pollChannelListDone(data) {
function channelListShow(JO) {
console.log("Formating channelList");
- var p = "<table class='membersList score' style='width:200px; background-color:transparent;'>";
+ var p = "<table class='membersList score' style='max-height:400px; width:220px; background-color:transparent; '>";
console.log('beginloop');
var previousI = 0;
-
for (var i in JO.users) {
console.log('loop')
var u = JO.users[i];
@@ -308,11 +312,9 @@ function channelListShow(JO) {
p = p+ " <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";
p = p+ " </div>";
p = p+ " </div>";
- p = p+ " <span class='scoreName' style='float:left;'><a href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";
+ p = p+ " <span class='scoreName' style='float:left;'><a target='_blank' href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";
p = p+ "</td>";
- //p = p+ "<td style='text-align:right;'>"+u.championPoints+"</td>";
- //p = p+ "</tr>";
previousI = i;
}
p = p+"</table>";
@@ -443,11 +445,25 @@ pollChannelList();
<div class='wrapper'>
<h3>Pathery Chat - BETA</h3>
+<style>
+
+ #channelContainer, #chatContainer {
+ overflow:hidden;
+ overflow-y:auto;
+ display:inline-block;
+ float:right;
+ height:400px;
+
+ }
+
+
+</style>
+
<div class='chatContainer2'>
- <div id='channelContainer' style='float:right; width:200px;'>Loading...</div>
+ <div id='channelContainer' style='float:right; width:220px; overflow-y:scroll; display:inline-block;'>Loading...</div>
- <div id='chatContainer' style='float:right; width:610px;'></div>
+ <div id='chatContainer' style='float:right; width:590px; '></div>
<div id='bb' style="clear:both"></div>