summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_tabs.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-20 15:56:52 +0100
committerPhil Hughes <me@iamphill.com>2017-04-20 15:56:52 +0100
commit7d7a0b2c5f534cd78e3239de7c936bd6f23e1bc7 (patch)
treed428086afa1ff698ed737c3b2cbb7235861d48d1 /app/assets/javascripts/merge_request_tabs.js
parentf09f753908a001e791a254d277032734f6fe57b6 (diff)
downloadgitlab-ce-diff-perf.tar.gz
Merge request performance improvementsdiff-perf
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index f7f6a773036..7acc3eff9f2 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -75,7 +75,7 @@ import './flash';
this.bindEvents();
this.activateTab(action);
- this.initAffix();
+ // this.initAffix();
}
bindEvents() {
@@ -347,13 +347,12 @@ import './flash';
if (Breakpoints.get().getBreakpointSize() === 'xs' || !$tabs.length) return;
const $diffTabs = $('#diff-notes-app');
+ const top = $diffTabs.offset().top - $tabs.height();
$tabs.off('affix.bs.affix affix-top.bs.affix')
.affix({
offset: {
- top: () => (
- $diffTabs.offset().top - $tabs.height()
- ),
+ top,
},
})
.on('affix.bs.affix', () => $diffTabs.css({ marginTop: $tabs.height() }))