From 0022efb7e43364943aca0ff39dc772cd056c34b8 Mon Sep 17 00:00:00 2001
From: Ibrahim Awwal <ibrahim.awwal@gmail.com>
Date: Thu, 6 Sep 2012 18:08:28 -0700
Subject: [PATCH] Add loading animation to discussion module.

---
 lms/static/coffee/src/discussion/utils.coffee             | 2 +-
 .../discussion/views/discussion_thread_inline_view.coffee | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lms/static/coffee/src/discussion/utils.coffee b/lms/static/coffee/src/discussion/utils.coffee
index 22adcff4b7..7c388d6d20 100644
--- a/lms/static/coffee/src/discussion/utils.coffee
+++ b/lms/static/coffee/src/discussion/utils.coffee
@@ -3,7 +3,7 @@ $ ->
     window.$$contents = {}
   $.fn.extend
     loading: ->
-      @$_loading = $("<span class='discussion-loading'></span>")
+      @$_loading = $("<div class='loading-animation'></div>")
       $(this).after(@$_loading)
     loaded: ->
       @$_loading.remove()
diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee
index 371ebcaac3..b7ce771eeb 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee
@@ -34,8 +34,6 @@ class @DiscussionThreadInlineView extends DiscussionContentView
     if @expanded
       @makeWmdEditor "reply-body"
       @renderResponses()
-#    @highlight @$(".post-body")
-#    @highlight @$("h1")
     @
 
   renderDogear: ->
@@ -60,6 +58,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView
   renderResponses: ->
     DiscussionUtil.safeAjax
       url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}"
+      $loading: @$el
       success: (data, textStatus, xhr) =>
         @$el.find(".loading").remove()
         Content.loadContentInfos(data['annotated_content_info'])
@@ -188,11 +187,8 @@ class @DiscussionThreadInlineView extends DiscussionContentView
       success: (response, textStatus) =>
         @model.set('endorsed', not endorsed)
 
-  highlight: (el) ->
-    el.html(el.html().replace(/&lt;mark&gt;/g, "<mark>").replace(/&lt;\/mark&gt;/g, "</mark>"))
-
   abbreviateBody: ->
-    abbreviated = DiscussionUtil.abbreviateString @model.get('body'), 140 # Because twitter
+    abbreviated = DiscussionUtil.abbreviateString @model.get('body'), 140
     @model.set('abbreviatedBody', abbreviated)
 
   expandPost: (event) ->