Commit 6acd6a49 authored by JC Brand's avatar JC Brand

Remove all code around minimizing chats. Not such a useful feature.

parent 1c5d6d8a
...@@ -25,14 +25,6 @@ var xmppchat = (function ($, console) { ...@@ -25,14 +25,6 @@ var xmppchat = (function ($, console) {
return o; return o;
}; };
obj.getMinimizedChats = function () {
var cookie = $.cookie('chats_minimized_'+xmppchat.username);
if (cookie) {
return cookie.split(/\|/);
}
return [];
};
obj.positionNewChat = function (chatbox) { obj.positionNewChat = function (chatbox) {
var open_chats = 0; var open_chats = 0;
for (var i=0; i<xmppchat.chats.length; i++) { for (var i=0; i<xmppchat.chats.length; i++) {
...@@ -133,12 +125,11 @@ var xmppchat = (function ($, console) { ...@@ -133,12 +125,11 @@ var xmppchat = (function ($, console) {
return $('#'+chat_id); return $('#'+chat_id);
}; };
obj.createChat = function (jid, minimize) { obj.createChat = function (jid) {
if (typeof(jid) === undefined) { if (typeof(jid) === undefined) {
return; return;
} }
var cookie = $.cookie('chats-open-'+this.username), var chat_content,
chat_content,
chatbox, chatbox,
chat_id = this.hash(jid); chat_id = this.hash(jid);
this.addChatToCookie(jid); this.addChatToCookie(jid);
...@@ -152,20 +143,14 @@ var xmppchat = (function ($, console) { ...@@ -152,20 +143,14 @@ var xmppchat = (function ($, console) {
} }
chatbox.find(".chat-textarea").focus(); chatbox.find(".chat-textarea").focus();
chat_content = chatbox.find('.chat-content'); chat_content = chatbox.find('.chat-content');
chat_content.scrollTop(chat_content[0].scrollHeight); if (chat_content.length > 0) {
chat_content.scrollTop(chat_content[0].scrollHeight);
}
return; return;
} }
chatbox = this.createChatBox(jid); chatbox = this.createChatBox(jid);
this.positionNewChat(chatbox); this.positionNewChat(chatbox);
this.chats.push(chat_id); this.chats.push(chat_id);
if (minimize == 1) {
// Minimize the chat if it's in the minimized_chats cookie
var minimized_chats = this.getMinimizedChats();
if (chat_id in this.oc(minimized_chats)) {
chatbox.find('.chat-content').css('display','none');
chatbox.find('.chat-input').css('display','none');
}
}
this.handleChatEvents(chat_id); this.handleChatEvents(chat_id);
chatbox.show(); chatbox.show();
chat_content = chatbox.find('.chat-content'); chat_content = chatbox.find('.chat-content');
...@@ -252,14 +237,7 @@ var xmppchat = (function ($, console) { ...@@ -252,14 +237,7 @@ var xmppchat = (function ($, console) {
'</div>'; '</div>';
} }
chat_content.append(message_html); chat_content.append(message_html);
if (chat_content.css('display') == 'none') {
// The chatbox is minimized, so we change it's header color to alert
// the user.
chat.find('.chat-head').addClass('chat-head-minimized-with-messages');
}
chat_content.scrollTop(chat_content[0].scrollHeight); chat_content.scrollTop(chat_content[0].scrollHeight);
jarnxmpp.UI.msg_counter += 1; jarnxmpp.UI.msg_counter += 1;
jarnxmpp.UI.updateMsgCounter(); jarnxmpp.UI.updateMsgCounter();
}); });
...@@ -289,41 +267,6 @@ var xmppchat = (function ($, console) { ...@@ -289,41 +267,6 @@ var xmppchat = (function ($, console) {
this.chats.pop(chat_id); this.chats.pop(chat_id);
}; };
obj.toggleChat = function (jid) {
/* Minimize or maximize a chat box and record it in a cookie so that we
* remember the configuration after page loads.
*/
var chat_id = this.hash(jid),
minimized_chats = xmppchat.getMinimizedChats(),
new_cookie;
if (jQuery('#'+chat_id+' .chat-content').css('display') == 'none') {
// Chat will be maximized
new_cookie = [];
for (var i=0; i < minimized_chats.length; i++) {
if (minimized_chats[i] != chat_id) {
new_cookie.push(minimized_chats[i]);
}
}
jQuery.cookie('chats_minimized_'+xmppchat.username, new_cookie.join('|'));
var chat_content = jQuery('#'+chat_id+' .chat-content');
chat_content.css('display','block');
chat_content.scrollTop(chat_content[0].scrollHeight);
jQuery('#'+chat_id+' .chat-head').removeClass('chat-head-minimized-with-messages');
jQuery('#'+chat_id+' .chat-input').css('display','block');
}
else {
// Chat will be minimized
if (!(chat_id in xmppchat.oc(minimized_chats))) {
new_cookie = chat_id;
new_cookie += '|'+minimized_chats.join('|');
jQuery.cookie('chats_minimized_'+xmppchat.username, new_cookie);
}
jQuery('#'+chat_id+' .chat-content').css('display','none');
jQuery('#'+chat_id+' .chat-input').css('display','none');
}
};
obj.keyPressed = function (event, textarea, audience, chat_id, chat_type) { obj.keyPressed = function (event, textarea, audience, chat_id, chat_type) {
if(event.keyCode == 13 && !event.shiftKey) { if(event.keyCode == 13 && !event.shiftKey) {
var textbox = jQuery(textarea); var textbox = jQuery(textarea);
...@@ -377,9 +320,10 @@ $(document).bind('jarnxmpp.message', function (event) { ...@@ -377,9 +320,10 @@ $(document).bind('jarnxmpp.message', function (event) {
}); });
$(document).bind('jarnxmpp.connected', function() { $(document).bind('jarnxmpp.connected', function() {
var chatdata = jQuery('span#babble-client-chatdata'); var chatdata = jQuery('span#babble-client-chatdata'),
var cookie = jQuery.cookie('chats-open-'+chatdata.attr('username')); cookie = jQuery.cookie('chats-open-'+chatdata.attr('username')),
var open_chats = [], chat_id; open_chats = [], chat_id;
xmppchat.username = chatdata.attr('username'); xmppchat.username = chatdata.attr('username');
xmppchat.base_url = chatdata.attr('base_url'); xmppchat.base_url = chatdata.attr('base_url');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment