summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-18 16:56:48 +0100
committerPhil Hughes <me@iamphill.com>2016-04-18 16:56:48 +0100
commit872d31d6e9566f55f9eadd12d496d07e86c13f0a (patch)
treebee046313c44d907ee7deeedf2628d1f1bc8fd65
parent58665b64f5bd8795571876587ea3a19253532286 (diff)
downloadgitlab-ce-872d31d6e9566f55f9eadd12d496d07e86c13f0a.tar.gz
Fixed issue with spinner not hiding on diff changes
-rw-r--r--app/assets/javascripts/merge_request_tabs.js.coffee7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 1ab6e5114bc..e8613cab72b 100644
--- 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