From 7144978b895d2941dc3e2169c4515bdff824b46e Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Mon, 19 Mar 2012 22:29:46 +0530 Subject: [PATCH] Fixes Channels API: the way it sets active channel id Signed-off-by: Akash Manohar J --- .../backbone/helpers/channels.js.coffee | 16 ++++++++++++---- app/assets/javascripts/backbone/kandan.js.coffee | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/backbone/helpers/channels.js.coffee b/app/assets/javascripts/backbone/helpers/channels.js.coffee index 021d2d0a..42f4ed03 100644 --- a/app/assets/javascripts/backbone/helpers/channels.js.coffee +++ b/app/assets/javascripts/backbone/helpers/channels.js.coffee @@ -6,13 +6,21 @@ class Kandan.Helpers.Channels @channel_pagination_el: (channel_id)-> $("#channels-#{channel_id} .pagination") + @get_channel_id_from_tab_index: (tab_index)-> + $("#channels .ui-tabs-panel") + .eq(tab_index) + .data('channel_id') + @selected_tab: ()-> - $('#channels').tabs('option', 'selected') + $('#channels').tabs('option', 'selected') @get_active_channel_id: ()-> - $("#channels .ui-tabs-panel") - .eq(@selected_tab()) - .data('channel_id') + if $(document).data('active_channel_id') == undefined + return $("#channels .ui-tabs-panel") + .eq(@selected_tab()) + .data('channel_id') + else + return $(document).data('active_channel_id') @new_activity_view: (activity_attributes)-> diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee index aa2d7f56..92046e63 100644 --- a/app/assets/javascripts/backbone/kandan.js.coffee +++ b/app/assets/javascripts/backbone/kandan.js.coffee @@ -49,6 +49,8 @@ window.Kandan = chatbox = new Kandan.Views.Chatbox() $(".container").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') })