Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delayed appearance of spinner in thread so things are less jumpy

Browse Source
This commit is contained in:
Tom Giannattasio
2012-09-11 14:08:57 -04:00
parent d88de52181
commit 87dcd07112
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
View File

@@ -14,6 +14,7 @@ if Backbone?
render: -> render: ->
@template = _.template($("#thread-template").html()) @template = _.template($("#thread-template").html())
@$el.html(@template(@model.toJSON())) @$el.html(@template(@model.toJSON()))
@$el.find(".loading").hide()
@delegateEvents() @delegateEvents()
@renderShowView() @renderShowView()
@@ -27,7 +28,10 @@ if Backbone?
if @responsesRequest? if @responsesRequest?
@responsesRequest.abort() @responsesRequest.abort()
renderResponses: -> renderResponses: ->
setTimeout(=>
@$el.find(".loading").show()
, 200)
@responsesRequest = DiscussionUtil.safeAjax @responsesRequest = DiscussionUtil.safeAjax
url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}" url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}"
success: (data, textStatus, xhr) => success: (data, textStatus, xhr) =>

3
lms/static/sass/_discussion.scss
View File

@@ -1309,7 +1309,7 @@ body.discussion {
> li { > li {
position: relative; position: relative;
margin: 0 -10px 30px; margin: 0 -10px 30px;
padding: 26px 30px 30px; padding: 26px 30px 20px;
border-radius: 3px; border-radius: 3px;
border: 1px solid #b2b2b2; border: 1px solid #b2b2b2;
box-shadow: 0 1px 3px rgba(0, 0, 0, .15); box-shadow: 0 1px 3px rgba(0, 0, 0, .15);
@@ -1573,6 +1573,7 @@ body.discussion {
.discussion-reply-new { .discussion-reply-new {
padding: 20px; padding: 20px;
@include clearfix; @include clearfix;
@include transition(opacity .2s);
h4 { h4 {
font-size: 16px; font-size: 16px;