diff options
author | Phil Hughes <me@iamphill.com> | 2017-10-23 14:24:51 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-23 14:24:51 +0100 |
commit | f03d9a9b42102a3eb88ba8a31059aef29d3675f2 (patch) | |
tree | 6ea1ea887edde16a2e70c5003123c4f6c2f96f60 /app/assets | |
parent | 35daaa36e0ee74e28422a3b088fd5b01249ea9b7 (diff) | |
download | gitlab-ce-f03d9a9b42102a3eb88ba8a31059aef29d3675f2.tar.gz |
fixed karma testssticky-perf
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index e64eb60231a..54c1b7a268e 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -68,6 +68,7 @@ import Diff from './diff'; constructor({ action, setUrl, stubLocation } = {}) { const mergeRequestTabs = document.querySelector('.js-tabs-affix'); + const navbar = document.querySelector('.navbar-gitlab'); const paddingTop = 16; this.diffsLoaded = false; @@ -79,7 +80,7 @@ import Diff from './diff'; this.setCurrentAction = this.setCurrentAction.bind(this); this.tabShown = this.tabShown.bind(this); this.showTab = this.showTab.bind(this); - this.stickyTop = document.querySelector('.navbar-gitlab').offsetHeight - paddingTop; + this.stickyTop = navbar ? navbar.offsetHeight - paddingTop : 0; if (mergeRequestTabs) { this.stickyTop += mergeRequestTabs.offsetHeight; |