From 31f7d6f4f47374c9e749b77ffa0d8fbf7ab6de9f Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 30 Aug 2012 16:50:46 -0400
Subject: [PATCH] Keep active thread active

---
 .../coffee/src/discussion/discussion_router.coffee    | 11 ++++++++---
 .../views/discussion_thread_list_view.coffee          |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lms/static/coffee/src/discussion/discussion_router.coffee b/lms/static/coffee/src/discussion/discussion_router.coffee
index 8bf518e059..7928120bd1 100644
--- a/lms/static/coffee/src/discussion/discussion_router.coffee
+++ b/lms/static/coffee/src/discussion/discussion_router.coffee
@@ -7,18 +7,23 @@ class @DiscussionRouter extends Backbone.Router
       @discussion = options['discussion']
       @nav = new DiscussionThreadListView(collection: @discussion, el: $(".sidebar"))
       @nav.on "thread:selected", @navigateToThread
+      @nav.on "threads:rendered", @setActiveThread
       @nav.render()
 
   allThreads: ->
       true
 
+  setActiveThread: =>
+    if @thread
+      @nav.setActiveThread(@thread.get("id"))
+
   showThread: (forum_name, thread_id) ->
-    @nav.setActiveThread(thread_id)
-    thread = @discussion.get(thread_id)
+    @thread = @discussion.get(thread_id)
+    @setActiveThread()
     if(@main)
       @main.undelegateEvents()
 
-    @main = new DiscussionThreadView(el: $(".discussion-column"), model: thread)
+    @main = new DiscussionThreadView(el: $(".discussion-column"), model: @thread)
     @main.render()
 
   navigateToThread: (thread_id) =>
diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index 24e420075c..c263770a3f 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -15,6 +15,7 @@ class @DiscussionThreadListView extends Backbone.View
   renderThreads: =>
     @$(".post-list").html("")
     @collection.each @renderThreadListItem
+    @trigger "threads:rendered"
 
   renderThreadListItem: (thread) =>
     view = new ThreadListItemView(model: thread)