Skip to content

Commit a2a5ebc

Browse files
committedApr 7, 2012
"fixing create and delete functionality again... "
1 parent 579a559 commit a2a5ebc

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed
 

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Kandan.Helpers.Channels
4646
$channelActivities.children().first().remove()
4747
oldest = $channelActivities.children().first().data("activity_id")
4848
$channelActivities.prev().data("oldest", oldest)
49-
@channel_pagination_el(channelId).show()
49+
@channel_pagination_el(channelId).show()
5050

5151

5252
@confirmAndDeleteChannel: (channel, tabIndex)->
@@ -74,14 +74,9 @@ class Kandan.Helpers.Channels
7474
deleted = deleted || false
7575
channelId = @getChannelIdByTabIndex(tabIndex)
7676
throw "NO CHANNEL ID" if channelId == 'undefined'
77-
7877
channel = new Kandan.Models.Channel({id: channelId})
7978
return @confirmAndDeleteChannel(channel, tabIndex) if not deleted
8079

81-
# NOTE this is for participating users who do not require confirmation
82-
console.log "TAB INDEX", tabIndex
83-
$("#kandan").tabs("remove", tabIndex)
84-
8580

8681
@channelExists: (channelId)->
8782
return true if $("#channels-#{channelId}").length > 0
@@ -91,7 +86,7 @@ class Kandan.Helpers.Channels
9186
@createChannelArea: (channel)->
9287
channelArea = "#channels-#{channel.get('id')}"
9388
totalTabs = $("#kandan").tabs("length")
94-
$createTab = $(".create_channel").parents('li').detach()
89+
$createTab = $("#create_channel").parents('li').detach()
9590
$("#kandan").tabs('add', channelArea, "#{channel.get("name")}", totalTabs)
9691
$createTab.appendTo('ul.ui-tabs-nav')
9792
view = new Kandan.Views.ChannelPane({channel: channel})

‎app/assets/javascripts/backbone/views/channel_tabs.js.coffee

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Kandan.Views.ChannelTabs extends Backbone.View
44

55
events:
66
"click .close_channel" : "deleteChannel"
7-
"click .create_channel": "createChannel"
7+
"click #create_channel": "createChannel"
88

99

1010
render: ()->
@@ -21,7 +21,9 @@ class Kandan.Views.ChannelTabs extends Backbone.View
2121
Kandan.Helpers.Channels.createChannelArea(model)
2222
})
2323
console.log "create channel: #{channelName}"
24+
return false
2425

2526
deleteChannel: (event)->
26-
channelIndex = $(event.target).closest('li').prevAll().length
27+
channelIndex = $(event.target).parents('li').prevAll().length
2728
Kandan.Helpers.Channels.deleteChannelByTabIndex(channelIndex) if channelIndex != 0
29+
return false

‎app/assets/javascripts/backbone/views/chatarea.js.coffee

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ class Kandan.Views.ChatArea extends Backbone.View
33
render: ->
44
tabView = new Kandan.Views.ChannelTabs({channels: @options.channels})
55
$('.header .logo').after(tabView.render().el)
6+
console.log(tabView);
7+
$('#create_channel').click(tabView.createChannel)
68

79
for channel in @options.channels.models
810
view = new Kandan.Views.ChannelPane({channel: channel})
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<li>
2-
<a href="#" class="create_channel">+</a>
2+
<a href="#" id="create_channel">+</a>
33
</li>

0 commit comments

Comments
 (0)
Please sign in to comment.