diff --git a/app/assets/javascripts/backbone/helpers/channels.js.coffee b/app/assets/javascripts/backbone/helpers/channels.js.coffee index 69e455e1..5910835c 100644 --- a/app/assets/javascripts/backbone/helpers/channels.js.coffee +++ b/app/assets/javascripts/backbone/helpers/channels.js.coffee @@ -62,7 +62,7 @@ class Kandan.Helpers.Channels @getChannelIdByTabIndex: (tabIndex)-> $("#kandan .ui-tabs-panel") .eq(tabIndex) - .data("channel-id") + .data("channel-id") @getTabIndexByChannelId: (channelId)-> $("#channels-#{channelId}").prevAll("div").length @@ -89,14 +89,14 @@ class Kandan.Helpers.Channels @createChannelArea: (channel)-> channelArea = "#channels-#{channel.get('id')}" totalTabs = $("#kandan").tabs("length") - $createTab = $("#create_channel").parents("li").detach() + createTab = $("#create_channel").parents("li").detach() $("#kandan").tabs("add", channelArea, "#{channel.get("name")}", totalTabs) - $createTab.appendTo("ul.ui-tabs-nav") + createTab.appendTo("ul.ui-tabs-nav") + $('#ui-tabs-1').remove() view = new Kandan.Views.ChannelPane({channel: channel}) - view.render $(channelArea) - $(channelArea).data("channel_id", channel.get("id")) - - + newChannel = $(channelArea) + view.render newChannel + newChannel.addClass('ui-tabs-panel') @newActivityView: (activityAttributes)-> activity = new Kandan.Models.Activity(activityAttributes) diff --git a/app/assets/javascripts/backbone/kandan.js.coffee.erb b/app/assets/javascripts/backbone/kandan.js.coffee.erb index 22d8670f..8d5824b2 100644 --- a/app/assets/javascripts/backbone/kandan.js.coffee.erb +++ b/app/assets/javascripts/backbone/kandan.js.coffee.erb @@ -88,7 +88,8 @@ window.Kandan = add: (event, ui) -> $('.header .ui-tabs-panel:last').detach().appendTo('#channels') $('#kandan').tabs('option', 'disabled', []) - $('.header ul a').delegate('cite.close_channel', 'click', window.tabViewGlobal.deleteChannel) + $('.header ul a').undelegate('cite.close_channel','click'). + delegate('cite.close_channel', 'click', window.tabViewGlobal.deleteChannel) }) $("#kandan").tabs 'option', 'tabTemplate', '''