From 7fdbafc34ec9d18e26bcf2739efefba47e66e235 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 29 Jul 2014 18:11:50 -0300 Subject: [PATCH] Fix chat.js with new jquery-ui tab api --- public/javascripts/chat.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/public/javascripts/chat.js b/public/javascripts/chat.js index 01a13f6..58a4ed9 100644 --- a/public/javascripts/chat.js +++ b/public/javascripts/chat.js @@ -529,11 +529,27 @@ jQuery(function($) { function create_conversation_tab(title, jid_id) { if (! $('#' + Jabber.tab_prefix + jid_id).length > 0) { // opening chat with selected online friend - var tab = $tabs.tabs('add', '#' + Jabber.tab_prefix + jid_id, title); + var panel = $('
').appendTo($tabs); + panel.append("
"); + + //FIXME + //var notice = $starting_chat_notice.replace('%{name}', $(ui.tab).html()); + //Jabber.show_notice(jid_id, notice); + + // define textarea name as '' + panel.find('textarea').attr('name', panel.id); + + if (Jabber.is_a_room(jid_id)) { + panel.append(Jabber.templates.occupant_list); + panel.find('.history').addClass('room'); + } + + $tabs.find('.ui-tabs-nav').append( "
  • "+title+"
  • " ); + $tabs.tabs('refresh'); + var jid = Jabber.jid_of(jid_id); $("a[href='#" + Jabber.tab_prefix + jid_id + "']").addClass($('#' + jid_id).attr('class') || 'icon-chat'); $('#' + Jabber.tab_prefix + jid_id).find('textarea').attr('data-to', jid); - $tabs.tabs('select', '#' + Jabber.tab_prefix + jid_id); } } @@ -555,7 +571,7 @@ jQuery(function($) { var $tabs = $('#chat-window #tabs').tabs({ tabTemplate: '
  • #{label}
  • ', panelTemplate: "
    ", - add: function(event, ui) { + add: function(event, ui) { //FIXME DEPRECATED var jid_id = ui.panel.id.replace(Jabber.tab_prefix, ''); var notice = $starting_chat_notice.replace('%{name}', $(ui.tab).html()); @@ -575,7 +591,7 @@ jQuery(function($) { var jid_id = ui.panel.id.replace(Jabber.tab_prefix, ''); count_unread_messages(jid_id, true); }, - remove: function(event, ui) { + remove: function(event, ui) { //FIXME DEPRECATED var jid_id = ui.panel.id.replace(Jabber.tab_prefix, ''); if (Jabber.is_a_room(jid_id)) { // exiting from a chat room -- libgit2 0.21.2