Skip to content

Commit daf9f8c

Browse files
committedMar 1, 2013
Merge pull request #147 from mjtko/master-138
Fix deletion of newly created channels (#138). Allows deletion of newly created channels.
2 parents b338f4a + ccbb6a8 commit daf9f8c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed
 

‎app/assets/javascripts/backbone/helpers/channels.js.coffee

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Kandan.Helpers.Channels
6262
@getChannelIdByTabIndex: (tabIndex)->
6363
$("#kandan .ui-tabs-panel")
6464
.eq(tabIndex)
65-
.data("channel-id")
65+
.data("channel-id")
6666

6767
@getTabIndexByChannelId: (channelId)->
6868
$("#channels-#{channelId}").prevAll("div").length
@@ -92,11 +92,11 @@ class Kandan.Helpers.Channels
9292
$createTab = $("#create_channel").parents("li").detach()
9393
$("#kandan").tabs("add", channelArea, "#{channel.get("name")}", totalTabs)
9494
$createTab.appendTo("ul.ui-tabs-nav")
95+
$('#ui-tabs-1').remove()
9596
view = new Kandan.Views.ChannelPane({channel: channel})
96-
view.render $(channelArea)
97-
$(channelArea).data("channel_id", channel.get("id"))
98-
99-
97+
$newChannel = $(channelArea)
98+
view.render $newChannel
99+
$newChannel.addClass('ui-tabs-panel')
100100

101101
@newActivityView: (activityAttributes)->
102102
activity = new Kandan.Models.Activity(activityAttributes)

‎app/assets/javascripts/backbone/kandan.js.coffee.erb

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ window.Kandan =
9090
add: (event, ui) ->
9191
$('.header .ui-tabs-panel:last').detach().appendTo('#channels')
9292
$('#kandan').tabs('option', 'disabled', [])
93-
$('.header ul a').delegate('cite.close_channel', 'click', window.tabViewGlobal.deleteChannel)
93+
$('.header ul a').undelegate('cite.close_channel','click').
94+
delegate('cite.close_channel', 'click', window.tabViewGlobal.deleteChannel)
9495
})
9596

9697
$("#kandan").tabs 'option', 'tabTemplate', '''

0 commit comments

Comments
 (0)
Please sign in to comment.