From 5f440dc739914c409d65803c5326d0c7f92cc177 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 19 Jul 2012 19:50:10 +0200 Subject: [PATCH] Remove chatui.js, not being used anymore. --- chat.js | 5 +- chatui.js | 151 ------------------------------------------------------ 2 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 chatui.js diff --git a/chat.js b/chat.js index 90a63a33d..523c7923c 100644 --- a/chat.js +++ b/chat.js @@ -215,10 +215,6 @@ xmppchat.ChatBoxView = Backbone.View.extend({ 'username': user_id, 'extra_classes': ($(message).find('delay').length > 0) && 'delayed' || '' })); - - // TODO: - // xmppchat.UI.msg_counter += 1; - // xmppchat.UI.updateMsgCounter(); $chat_content.scrollTop($chat_content[0].scrollHeight); } }, @@ -1091,6 +1087,7 @@ $(document).ready(function () { $toggle = $('a#toggle-online-users'); $toggle.unbind('click'); + $('ul.tabs').tabs('div.panes > div'); xmppchat.username = chatdata.attr('username'); xmppchat.base_url = chatdata.attr('base_url'); diff --git a/chatui.js b/chatui.js deleted file mode 100644 index 2cb0cc14c..000000000 --- a/chatui.js +++ /dev/null @@ -1,151 +0,0 @@ -xmppchat.UI = (function (xmppUI, $, console) { - var ob = xmppUI; - ob.chats = []; - ob.chat_focus = []; - - ob.addUserToRosterUI = function (user_id, bare_jid, fullname, userstatus) {}; - - ob.updateOnPresence = function (jid, status, presence) { - var user_id = Strophe.getNodeFromJid(jid), - bare_jid = Strophe.getBareJidFromJid(jid), - resource, - online_count, - $chat = $("#"+helpers.hash(bare_jid)), - $chat_content, - existing_user_element = $('#online-users-' + user_id); - - if (xmppchat.isOwnUser(jid)) { return; } - - if ($chat.length > 0) { - $chat_content = $chat.find(".chat-content"); - $chat_content.find('div.chat-event').remove(); - if (status === 'offline') { - xmppchat.Presence.getUserInfo(user_id, function (data) { - $chat_content.append($('
').addClass('chat-event').text(data.fullname + ' has gone offline.')); - $chat_content.scrollTop($content[0].scrollHeight); - }); - } else if (status === 'unsubscribe') { - xmppchat.Presence.getUserInfo(user_id, function (data) { - $chat_content.append($('
').addClass('chat-event').text(data.fullname + ' has removed you as a contact.')); - $chat_content.scrollTop($content[0].scrollHeight); - }); - if (existing_user_element.length > 0) { - existing_user_element.remove(); - } - $('#online-count').text(xmppchat.Presence.onlineCount()); - return; - } - } - - if (existing_user_element.length > 0) { - existing_user_element.attr('class', status); - } else if ((status !== 'offline') && (status !== 'unavailable')) { - xmppchat.Presence.getUserInfo(user_id, function (data) { - xmppchat.UI.addUserToRosterUI(user_id, bare_jid, data.fullname, status); - }); - } else { // status is offline and the user isn't shown as online - return; - } - $('#online-count').text(xmppchat.Presence.onlineCount()); - }; - - ob.positionNewChat = function ($chat) {}; - - ob.handleChatEvents = function (chat_id) { - var chat_area = $("#"+chat_id+" .chat-textarea"), - chat_type = chat_id.split('_')[0], - that = this; - - that.chat_focus[chat_id] = false; - chat_area.blur(function () { - that.chat_focus[chat_id] = false; - chat_area.removeClass('chat-textarea-'+chat_type+'-selected'); - }).focus(function (){ - that.chat_focus[chat_id] = true; - chat_area.addClass('chat-textarea-'+chat_type+'-selected'); - }); - var chatbox = $("#"+chat_id); - chatbox.click(function () { - if (chatbox.find('.chat-content').is(':visible')) { - chatbox.find('.chat-textarea').focus(); - } - }); - }; - - ob.insertCollectionMessages = function ($chat, bare_jid, recipient_name) { - xmppchat.Collections.getLastMessages(bare_jid, function (result) { - $('body').append($chat); - $(result).find('chat').children().each(function (idx, el) { - if (el.tagName !== 'set') { - // TODO: Calculate the time. We have the start time and the offset for each message... - var text = $(el).find('body').text(), - now = new Date(), - time = now.toLocaleTimeString().substring(0,5), - $content = $chat.find('.chat-content'); - div = $('
'); - - if (el.tagName == 'to') { - message_html = div.append( - ''+time+' me:  ' + - ''+text+'' - ); - } else { - message_html = div.append( - ''+time+' '+recipient_name+':  ' + - ''+text+'' - ); - } - $content.append(message_html); - $content.scrollTop($content[0].scrollHeight); - } - }); - callback($chat); - }); - }; - - ob.insertClientStoredMessages = function ($chat, bare_jid, recipient_name) {}; - ob.createChatbox = function (bare_jid, callback) {}; - - ob.prepNewChat = function (chat, jid) { - // Some operations that need to be applied on a chatbox - // after it has been created. - var chat_content, - value; - if (jid === 'online-users-container') { - // Make sure the xmpp status is correctly set on the control box - value = xmppchat.Storage.get(xmppchat.username+'-xmpp-status') || 'online'; - $(chat).find('#select-xmpp-status').val(value); - } else { - chat_content = $(chat).find('.chat-content'); - $(chat).find(".chat-textarea").focus(); - if (chat_content.length > 0) { - chat_content.scrollTop(chat_content[0].scrollHeight); - } - } - - if (_.indexOf(this.chats, jid) == -1) { - this.chats.push(jid); - } - this.addChatToCookie(jid); - }; - - ob.getChatbox = function (jid, callback) {}; - ob.reorderChats = function () {}; - ob.addChatToCookie = function (jid) {}; - - return ob; -})(xmppchat.UI || {}, jQuery, console || {log: function(){}} ); - - -// Event handlers -// -------------- -$(document).ready(function () { - $('ul.tabs').tabs('div.panes > div'); - - $('select#select-xmpp-status').bind('change', function (ev) { - var jid = xmppchat.connection.jid, - value = ev.target.value; - xmppchat.Presence.sendPresence(value); - xmppchat.Storage.set(xmppchat.username+'-xmpp-status', value); - }); -});