From d6bece9bd26bc7b7f2df730b43481006605f7e20 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Wed, 29 Aug 2012 15:37:23 -0400
Subject: [PATCH] Move user to window. Mark followed threads in list view.

---
 lms/static/coffee/src/discussion/discussion_router.coffee    | 3 +--
 .../src/discussion/views/discussion_thread_view.coffee       | 5 ++---
 .../coffee/src/discussion/views/thread_list_item_view.coffee | 2 ++
 lms/templates/discussion/single_thread.html                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lms/static/coffee/src/discussion/discussion_router.coffee b/lms/static/coffee/src/discussion/discussion_router.coffee
index 7c1a5a4b7a..194e5ef2df 100644
--- a/lms/static/coffee/src/discussion/discussion_router.coffee
+++ b/lms/static/coffee/src/discussion/discussion_router.coffee
@@ -4,7 +4,6 @@ class @DiscussionRouter extends Backbone.Router
     ":forum_name/threads/:thread_id" : "showThread"
 
   initialize: (options) ->
-      @user = options['user']
       @discussion = options['discussion']
       @nav = new DiscussionThreadListView(collection: @discussion, el: $(".post-list"))
       @nav.on "thread:selected", @navigateToThread
@@ -16,7 +15,7 @@ class @DiscussionRouter extends Backbone.Router
   showThread: (forum_name, thread_id) ->
     @nav.setActiveThread(thread_id)
     thread = @discussion.get(thread_id)
-    view = new DiscussionThreadView(el: $(".discussion-column"), model: thread, user: @user)
+    view = new DiscussionThreadView(el: $(".discussion-column"), model: thread)
     view.render()
 
   navigateToThread: (thread_id) =>
diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
index ddf1804a7e..b429ce3e63 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
@@ -5,7 +5,6 @@ class @DiscussionThreadView extends Backbone.View
   template: _.template($("#thread-template").html())
 
   initialize: (options) ->
-    @user = options['user']
     @model.bind "change", @updateModelDetails
     @$el.html(@template(@model.toJSON()))
 
@@ -13,10 +12,10 @@ class @DiscussionThreadView extends Backbone.View
     @$(".votes-count-number").html(@model.get("votes")["up_count"])
 
   render: ->
-    if @user.following(@model)
+    if window.user.following(@model)
       @$(".dogear").addClass("is-followed")
 
-    if @user.voted(@model)
+    if window.user.voted(@model)
       @$(".vote-btn").addClass("is-cast")
     @$("span.timeago").timeago()
     @renderResponses()
diff --git a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
index 2a6bd765ba..0200bd4548 100644
--- a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
+++ b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
@@ -7,6 +7,8 @@ class @ThreadListItemView extends Backbone.View
     @model.on "change", @render
   render: =>
     @$el.html(@template(@model.toJSON()))
+    if window.user.following(@model)
+      @$("a").addClass("followed")
     @
   threadSelected: ->
     @trigger("thread:selected", @model.id)
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 64d31f2f66..35fdd60e70 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -143,10 +143,10 @@
     $$contents = {}
     $$discussions = {}
     $(document).ready(function() {
-        var user = new DiscussionUser(JSON.parse("${user_info | escapejs}"));
+        window.user = new DiscussionUser(JSON.parse("${user_info | escapejs}"));
         var discussion = new Discussion(JSON.parse("${threads | escapejs}"));
 
-        var app = new DiscussionRouter({user: user, discussion: discussion})
+        var app = new DiscussionRouter({discussion: discussion})
         Backbone.history.start({pushState: true, root: "/courses/${course_id}/discussion/forum/"})
     });
 </script>