Skip to content

Commit 31df912

Browse files
committedMar 26, 2012
Uses jquery icon for close. Callback for delete now being called; Channel deletion WIP
Signed-off-by: Akash Manohar J <akash@akash.im>
1 parent ff3d1c4 commit 31df912

File tree

5 files changed

+26
-15
lines changed

5 files changed

+26
-15
lines changed
 

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ class Kandan.Helpers.Channels
33
@options:
44
autoScrollThreshold: 0.90
55

6-
@templates:
7-
addChannelButton: _.template '''
8-
<span class="delete_channel">[x]</span>
9-
'''
10-
116
@replaceCreateButton: ()->
127
$tabNav = $(".create_channel").parent().parent()
138
$createButton = $(".create_channel").parent().html()
@@ -65,7 +60,7 @@ class Kandan.Helpers.Channels
6560
channel_area = "#channels-#{channel.get('id')}"
6661
totalTabs = $("#channels").tabs("length")
6762

68-
$("#channels").tabs('add', channel_area, "#{channel.get("name")}#{@templates.addChannelButton()}", totalTabs)
63+
$("#channels").tabs('add', channel_area, "#{channel.get("name")}", totalTabs)
6964
Kandan.Helpers.Channels.replaceCreateButton()
7065
view = new Kandan.Views.ListActivities({channel: channel})
7166
$(channel_area).html $(view.render().el).html()

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

+19-5
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,26 @@ window.Kandan =
7070
$(".main-area").html(chat_area.render().el)
7171
chatbox = new Kandan.Views.Chatbox()
7272
$(".main-area").append(chatbox.render().el)
73-
$('#channels').tabs({select: (event, ui)->
74-
$(document).data('active_channel_id',
75-
Kandan.Helpers.Channels.get_channel_id_from_tab_index(ui.index))
76-
console.log "channel changed to index", ui.index
77-
Kandan.Data.Channels.run_callbacks('change')
73+
$('#channels').tabs({
74+
# tabTemplate: '''
75+
# <li>
76+
# <a href="#{href}">#{label}</a>
77+
# Dude<span class="ui-icon ui-icon-close">Remove Tab</span>
78+
# </li>
79+
# ''',
80+
81+
select: (event, ui)->
82+
$(document).data('active_channel_id',
83+
Kandan.Helpers.Channels.get_channel_id_from_tab_index(ui.index))
84+
console.log "channel changed to index", ui.index
85+
Kandan.Data.Channels.run_callbacks('change')
7886
})
87+
$("#channels").tabs('option', 'tabTemplate', '''
88+
<li>
89+
<a href="#{href}">#{label}</a>
90+
<span class="ui-icon ui-icon-close">x</span>
91+
</li>
92+
''')
7993

8094
Kandan.Widgets.init_all()
8195
})

‎app/assets/javascripts/backbone/models/channel.js.coffee

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
class Kandan.Models.Channel extends Backbone.Model
2-
urlRoot: '/channels'
2+
urlRoot: ()->
3+
console.log "called urlRoot"
4+
'/channels'
35

46
# initialize: ()->
57
# console.log @activities

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class Kandan.Views.ChatArea extends Backbone.View
44
# className: 'channels'
55

66
events:
7-
"click .delete_channel": "deleteChannel"
8-
"click .create_channel" : "createChannel"
7+
"click .ui-icon-close" : "deleteChannel"
8+
"click .create_channel": "createChannel"
99

1010
render: ->
1111
$(@el).html(@template({channels: @options.channels}))

‎app/assets/templates/chatarea.jst.eco

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ul>
22
<% for channel in @channels.models: %>
33
<li>
4-
<a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a><span class="delete_channel">[x]</span>
4+
<a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a><span class="ui-icon ui-icon-close">x</span>
55
</li>
66
<% end %>
77
<li><div class="create_channel">+</div></li>

0 commit comments

Comments
 (0)
Please sign in to comment.