Merge branch 'mr-diff-loading-spinner' into 'master'

MR diff loading spinner

When you click `Changes` tab if diff is big - you now see loading spinner
This commit is contained in:
Dmitriy Zaporozhets 2014-06-23 06:37:14 +00:00
commit fe00d0f50d
2 changed files with 4 additions and 3 deletions

View file

@ -109,10 +109,10 @@ class MergeRequest
type: 'GET'
url: this.$('.merge-request-tabs .diffs-tab a').attr('href')
beforeSend: =>
this.$('.status').addClass 'loading'
this.$('.mr-loading-status .loading').show()
complete: =>
@diffs_loaded = true
this.$('.status').removeClass 'loading'
this.$('.mr-loading-status .loading').hide()
success: (data) =>
this.$(".diffs").html(data.html)
dataType: 'json'

View file

@ -31,7 +31,8 @@
= render "projects/merge_requests/show/diffs"
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render "projects/notes/notes_with_form"
.status
.mr-loading-status
= spinner
:javascript
var merge_request;