Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fixed some bugs around the proper ordering of chatboxes.

Browse Source
This commit is contained in:
JC Brand 2012-06-20 21:47:23 +02:00
parent 6acd6a4949
commit ce4528b6f5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
collective.xmpp.chat.js
View File

@ -2,6 +2,7 @@ var xmppchat = (function ($, console) {
var obj = {}; var obj = {};
obj.chats = []; obj.chats = [];
obj.chat_focus = []; obj.chat_focus = [];
obj.chatbox_width = 205;
obj.sanitizePath = function (call) { obj.sanitizePath = function (call) {
return xmppchat.base_url + call; return xmppchat.base_url + call;
@ -26,7 +27,8 @@ var xmppchat = (function ($, console) {
}; };
obj.positionNewChat = function (chatbox) { obj.positionNewChat = function (chatbox) {
var open_chats = 0; var open_chats = 0,
offset;
for (var i=0; i<xmppchat.chats.length; i++) { for (var i=0; i<xmppchat.chats.length; i++) {
if ($("#"+xmppchat.hash(xmppchat.chats[i])).css('display') != 'none') { if ($("#"+xmppchat.hash(xmppchat.chats[i])).css('display') != 'none') {
open_chats++; open_chats++;
@ -36,8 +38,8 @@ var xmppchat = (function ($, console) {
chatbox.css('right', '15px'); chatbox.css('right', '15px');
} }
else { else {
width = (open_chats)*(225+7)+15; offset = (open_chats)*(this.chatbox_width+7)+15;
chatbox.css('right', width+'px'); chatbox.css('right', offset+'px');
} }
}; };
@ -146,11 +148,15 @@ var xmppchat = (function ($, console) {
if (chat_content.length > 0) { if (chat_content.length > 0) {
chat_content.scrollTop(chat_content[0].scrollHeight); chat_content.scrollTop(chat_content[0].scrollHeight);
} }
if (!(jid in this.oc(this.chats))) {
// Initially the chat status box won't be in this.chats.
this.chats.push(jid);
}
return; return;
} }
chatbox = this.createChatBox(jid); chatbox = this.createChatBox(jid);
this.positionNewChat(chatbox); this.positionNewChat(chatbox);
this.chats.push(chat_id); this.chats.push(jid);
this.handleChatEvents(chat_id); this.handleChatEvents(chat_id);
chatbox.show(); chatbox.show();
chat_content = chatbox.find('.chat-content'); chat_content = chatbox.find('.chat-content');
@ -167,7 +173,8 @@ var xmppchat = (function ($, console) {
}; };
obj.reorderChats = function () { obj.reorderChats = function () {
var index = 0; var index = 0,
offset;
for (var i=0; i < this.chats.length; i++) { for (var i=0; i < this.chats.length; i++) {
var chatbox = $("#"+this.hash(this.chats[i])); var chatbox = $("#"+this.hash(this.chats[i]));
if (chatbox.css('display') != 'none') { if (chatbox.css('display') != 'none') {
@ -175,15 +182,15 @@ var xmppchat = (function ($, console) {
chatbox.css('right', '15px'); chatbox.css('right', '15px');
} }
else { else {
width = (index)*(225+7)+15; offset = (index)*(this.chatbox_width+7)+15;
chatbox.css('right', width+'px'); chatbox.css('right', offset +'px');
} }
index++; index++;
} }
} }
}; };
obj.addChatToCookie = function (chat_id) { obj.addChatToCookie = function (jid) {
var cookie = jQuery.cookie('chats-open-'+xmppchat.username), var cookie = jQuery.cookie('chats-open-'+xmppchat.username),
new_cookie, new_cookie,
open_chats = []; open_chats = [];
@ -191,14 +198,13 @@ var xmppchat = (function ($, console) {
if (cookie) { if (cookie) {
open_chats = cookie.split('|'); open_chats = cookie.split('|');
} }
if (!(chat_id in this.oc(open_chats))) { if (!(jid in this.oc(open_chats))) {
// Update the cookie if this new chat is not yet in it. // Update the cookie if this new chat is not yet in it.
open_chats.push(chat_id); open_chats.push(jid);
new_cookie = open_chats.join('|'); new_cookie = open_chats.join('|');
jQuery.cookie('chats-open-'+xmppchat.username, new_cookie, {path: '/'}); jQuery.cookie('chats-open-'+xmppchat.username, new_cookie, {path: '/'});
console.log('updated cookie = ' + new_cookie + '\n'); console.log('updated cookie = ' + new_cookie + '\n');
} }
this.chats.push(chat_id);
}; };
obj.receiveMessage = function (event) { obj.receiveMessage = function (event) {
@ -264,7 +270,7 @@ var xmppchat = (function ($, console) {
else { else {
jQuery.cookie('chats-open-'+xmppchat.username, null, {path: '/'}); jQuery.cookie('chats-open-'+xmppchat.username, null, {path: '/'});
} }
this.chats.pop(chat_id); this.chats.pop(jid);
}; };
obj.keyPressed = function (event, textarea, audience, chat_id, chat_type) { obj.keyPressed = function (event, textarea, audience, chat_id, chat_type) {