This commit is contained in:
2014-12-13 03:18:04 +01:00
parent ae20f82a43
commit 0e4b1a3e6d
24 changed files with 499 additions and 497 deletions

View File

@@ -22,7 +22,7 @@
<div id="chat_messages"></div>
</div>
</div>
<div id="chat_input" class="tiny_round">
<div id="chat_input" class="round">
<form id="chat_form" name="chat_form">
<i id="message_img" class="fa fa-fw fa-20 fa-c-comment"></i><input type="text" id="message" name="message" value="" maxlength="500" autofocus />
<input type="hidden" id="chan" name="chan" value="" maxlength="50" />
@@ -252,7 +252,7 @@ function setChanButton()
.append
(
$('<span>', {id:'join_chan_input'})
.text('#')
.append($('<span>', {'class':'hash'}).text('#'))
.append
(
$('<input>', {type:'text', id:'input_chan', 'class':'round'})
@@ -755,7 +755,7 @@ function addMessage(message_info, bReset)
break;
case databap.consts.msg_types.conn:
updateUsersList = true;
msg_body = (self.vars2('opt_console')==self.consts.opt_console_no)?'':'<span class="text action">'+message_info.nickname+' '+message_info.message+'</span>';
msg_body = (!self.vars2('opt_console'))?'':'<span class="text action">'+message_info.nickname+' '+message_info.message+'</span>';
bSystemMsg = true;
break;
case databap.consts.msg_types.img:
@@ -809,7 +809,7 @@ function addMessage(message_info, bReset)
if(msg_body != '')
{
//Adding message to channel panel
$Message = $('<p class="'+message_info.msg_class+' class_'+sChanKeyName+' hide round_right"></p>').append('<span class="time">'+message_info.time+'</span>', msg_body);
$Message = $('<p>', {'class':message_info.msg_class+' class_'+sChanKeyName+' hide round_right'}).append($('<span>', {'class':'time'}).text(((message_info.date==databap.consts.cur_date)?'':message_info.date+' - ')+message_info.time), msg_body);
$Message.find('.chan_link').click(function(){joinChan($(this).find('.chan_text').text());});
$Message.find('.user').click(setPm);
databap.getMainElem('#chat_messages').append($Message);