From 8401ec56e3c8ae1ba3db8a1554acf328af45f98d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 20 Jun 2014 12:17:06 +0300 Subject: [PATCH] Show spinner when loading MR diff Signed-off-by: Dmitriy Zaporozhets --- app/assets/javascripts/merge_request.js.coffee | 4 ++-- app/views/projects/merge_requests/_show.html.haml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index b04a81c85eb..59e53b69e3d 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -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' diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 486454793ba..8fca9f0212b 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -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;