Merge branch 'diff-js-error-fix' into 'master'

Fixed issue with spinner not hiding on diff changes See merge request !3793

Merge branch 'diff-js-error-fix' into 'master'
e6ee1f36 · Robert Speicher · ea615534 · 872d31d6 · e6ee1f36
Commit e6ee1f36 authored Apr 18, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

merge_request_tabs.js.coffee app/assets/javascripts/merge_request_tabs.js.coffee +4 -3

No files found.
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -183,9 +183,10 @@ class @MergeRequestTabs
      else
        $diffLine = $('td', $diffLine)

-      $diffLine.addClass 'hll'
-      diffLineTop = $diffLine.offset().top
-      navBarHeight = $('.navbar-gitlab').outerHeight()
+      if $diffLine.length
+        $diffLine.addClass 'hll'
+        diffLineTop = $diffLine.offset().top
+        navBarHeight = $('.navbar-gitlab').outerHeight()

  loadBuilds: (source) ->
    return if @buildsLoaded