Uses jquery icon for close. Callback for delete now being called; Cha…

…nnel deletion WIP Signed-off-by: Akash Manohar J <akash@akash.im>
kandanapp · Mar 26, 2012 · 31df912 · 31df912
1 parent ff3d1c4
commit 31df912
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/app/assets/javascripts/backbone/helpers/channels.js.coffee b/app/assets/javascripts/backbone/helpers/channels.js.coffee
@@ -3,11 +3,6 @@ class Kandan.Helpers.Channels
   @options:
     autoScrollThreshold: 0.90
 
-  @templates:
-    addChannelButton: _.template '''
-        <span class="delete_channel">[x]</span>
-      '''
-
   @replaceCreateButton: ()->
     $tabNav = $(".create_channel").parent().parent()
     $createButton = $(".create_channel").parent().html()
@@ -65,7 +60,7 @@ class Kandan.Helpers.Channels
     channel_area = "#channels-#{channel.get('id')}"
     totalTabs = $("#channels").tabs("length")
 
-    $("#channels").tabs('add', channel_area, "#{channel.get("name")}#{@templates.addChannelButton()}", totalTabs)
+    $("#channels").tabs('add', channel_area, "#{channel.get("name")}", totalTabs)
     Kandan.Helpers.Channels.replaceCreateButton()
     view = new Kandan.Views.ListActivities({channel: channel})
     $(channel_area).html $(view.render().el).html()

diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee
@@ -70,12 +70,26 @@ window.Kandan =
           $(".main-area").html(chat_area.render().el)
           chatbox = new Kandan.Views.Chatbox()
           $(".main-area").append(chatbox.render().el)
-          $('#channels').tabs({select: (event, ui)->
-            $(document).data('active_channel_id',
-              Kandan.Helpers.Channels.get_channel_id_from_tab_index(ui.index))
-            console.log "channel changed to index", ui.index
-            Kandan.Data.Channels.run_callbacks('change')
+          $('#channels').tabs({
+            # tabTemplate: '''
+            #   <li>
+            #     <a href="#{href}">#{label}</a>
+            #     Dude<span class="ui-icon ui-icon-close">Remove Tab</span>
+            #   </li>
+            # ''',
+
+            select: (event, ui)->
+              $(document).data('active_channel_id',
+                Kandan.Helpers.Channels.get_channel_id_from_tab_index(ui.index))
+              console.log "channel changed to index", ui.index
+              Kandan.Data.Channels.run_callbacks('change')
           })
+          $("#channels").tabs('option', 'tabTemplate', '''
+              <li>
+                <a href="#{href}">#{label}</a>
+                <span class="ui-icon ui-icon-close">x</span>
+              </li>
+            ''')
 
           Kandan.Widgets.init_all()
       })

diff --git a/app/assets/javascripts/backbone/models/channel.js.coffee b/app/assets/javascripts/backbone/models/channel.js.coffee
@@ -1,5 +1,7 @@
 class Kandan.Models.Channel extends Backbone.Model
-  urlRoot: '/channels'
+  urlRoot: ()->
+    console.log "called urlRoot"
+    '/channels'
 
   # initialize: ()->
     # console.log @activities

diff --git a/app/assets/javascripts/backbone/views/chatarea.js.coffee b/app/assets/javascripts/backbone/views/chatarea.js.coffee
@@ -4,8 +4,8 @@ class Kandan.Views.ChatArea extends Backbone.View
   # className: 'channels'
 
   events:
-    "click .delete_channel": "deleteChannel"
-    "click .create_channel"   : "createChannel"
+    "click .ui-icon-close" : "deleteChannel"
+    "click .create_channel": "createChannel"
 
   render: ->
     $(@el).html(@template({channels: @options.channels}))

diff --git a/app/assets/templates/chatarea.jst.eco b/app/assets/templates/chatarea.jst.eco
@@ -1,7 +1,7 @@
 <ul>
   <% for channel in @channels.models: %>
     <li>
-      <a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a><span class="delete_channel">[x]</span>
+      <a href="#<%= "channels-#{channel.get('id')}" %>"><%= channel.get('name') %></a><span class="ui-icon ui-icon-close">x</span>
     </li>
   <% end %>
   <li><div class="create_channel">+</div></li>