diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-18 16:30:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-18 16:30:41 +0000 |
| commit | e6ee1f36c4c6658bd4ddafa473c27c33594c9095 (patch) | |
| tree | 4a72b90297c8b268dbe202bca915566e78600934 | |
| parent | ea615534ca3e153784b30b7c5611c752b4eb47e6 (diff) | |
| parent | 872d31d6e9566f55f9eadd12d496d07e86c13f0a (diff) | |
| download | gitlab-ce-e6ee1f36c4c6658bd4ddafa473c27c33594c9095.tar.gz | |
Merge branch 'diff-js-error-fix' into 'master'
Fixed issue with spinner not hiding on diff changes
See merge request !3793
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 7 |
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 |