diff --git a/lms/static/coffee/src/discussion/discussion_module.coffee b/lms/static/coffee/src/discussion/discussion_module.coffee index 6452d065d8..4bcacc1474 100644 --- a/lms/static/coffee/src/discussion/discussion_module.coffee +++ b/lms/static/coffee/src/discussion/discussion_module.coffee @@ -18,6 +18,7 @@ if Backbone? url = DiscussionUtil.urlFor 'retrieve_discussion', discussion_id DiscussionUtil.safeAjax $elem: $elem + $loading: $elem url: url type: "GET" dataType: 'json' diff --git a/lms/static/coffee/src/discussion/utils.coffee b/lms/static/coffee/src/discussion/utils.coffee index b05d3d8974..e156b09a63 100644 --- a/lms/static/coffee/src/discussion/utils.coffee +++ b/lms/static/coffee/src/discussion/utils.coffee @@ -1,9 +1,9 @@ $ -> $.fn.extend loading: -> - $(this).after("") + $(this).after("") loaded: -> - $(this).parent().children(".loading").remove() + $(this).parent().children(".discussion-loading").remove() class @DiscussionUtil diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 28466894ad..717770f459 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -35,7 +35,13 @@ $tag-text-color: #5b614f; } } - +.discussion-loading { + background-image: url(../images/discussion/loading.gif); + width: 15px; + height: 15px; + margin-left: 2px; + display: inline-block; +} /*** Discussions ***/ @@ -49,16 +55,6 @@ $tag-text-color: #5b614f; margin-top: 0; } - .loading { - background-image: url(../images/discussion/loading.gif); - width: 15px; - height: 15px; - margin-left: 2px; - display: inline-block; - } - - - /*** Sidebar ***/ .sidebar-module {