Merge pull request #147 from mjtko/master-138

Fix deletion of newly created channels (#138). Allows deletion of newly created channels.
kandanapp · Mar 1, 2013 · daf9f8c · daf9f8c
2 parents b338f4a + ccbb6a8
commit daf9f8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -92,11 +92,11 @@ class Kandan.Helpers.Channels
     $createTab = $("#create_channel").parents("li").detach()
     $("#kandan").tabs("add", channelArea, "#{channel.get("name")}", totalTabs)
     $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
@@ -90,7 +90,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', '''