Merge branch 'build-cancel-spinner' into 'master'

Hide build spinner on canceled builds ## What does this MR do? If the build has canceled this correctly hides the spinner ## What are the relevant issue numbers? Closes #19651 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_13.51.57](/uploads/8342470cf35dae7c67168d9153592fb6/Screen_Shot_2016-07-11_at_13.51.57.png) See merge request !5182

Merge branch 'build-cancel-spinner' into 'master'
52cc64a8 · Fatih Acet · ad599eb6 · c735c53a · 52cc64a8
Commit 52cc64a8 authored Sep 06, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

build.js app/assets/javascripts/build.js +3 -1

No files found.
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -54,12 +54,14 @@
    }

    Build.prototype.getInitialBuildTrace = function() {
+      var removeRefreshStatuses = ['success', 'failed', 'canceled', 'skipped']
+
      return $.ajax({
        url: this.build_url,
        dataType: 'json',
        success: function(build_data) {
          $('.js-build-output').html(build_data.trace_html);
-          if (build_data.status === 'success' || build_data.status === 'failed') {
+          if (removeRefreshStatuses.indexOf(build_data.status) >= 0) {
            return $('.js-build-refresh').remove();
          }
        }