Merge branch 'rs-mr-tab-loader' into 'master'

Make the loading spinner toggle more explicit Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! 💥 See merge request !1553

Merge branch 'rs-mr-tab-loader' into 'master'
192dd58d · Douwe Maan · ab5066e5 · 29fe488b · 192dd58d
Commit 192dd58d authored Oct 09, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

merge_request_tabs.js.coffee app/assets/javascripts/merge_request_tabs.js.coffee +8 -5

No files found.
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -69,7 +69,7 @@ class @MergeRequestTabs
  scrollToElement: (container) ->
    if window.location.hash
      top = $(container + " " + window.location.hash).offset().top
-      $('body').scrollTo(top);
+      $('body').scrollTo(top)

  # Activate a tab based on the current action
  activateTab: (action) ->
@@ -139,13 +139,16 @@ class @MergeRequestTabs
        @diffsLoaded = true
        @scrollToElement(".diffs")

-  toggleLoading: ->
-    $('.mr-loading-status .loading').toggle()
+  # Show or hide the loading spinner
+  #
+  # status - Boolean, true to show, false to hide
+  toggleLoading: (status) ->
+    $('.mr-loading-status .loading').toggle(status)

  _get: (options) ->
    defaults = {
-      beforeSend: @toggleLoading
-      complete: @toggleLoading
+      beforeSend: => @toggleLoading(true)
+      complete:   => @toggleLoading(false)
      dataType: 'json'
      type: 'GET'
    }