diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-29 19:15:20 +0300 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-01 21:30:00 +0300 |
| commit | 719c925e215ff4a85f5f1cfe5fae3f74b45b93d4 (patch) | |
| tree | d25a3fa5857473447d88a2e888601e1e4b528f3b /app | |
| parent | 8111c2164746a2f6bd1ce4c55c08c9822c2f7e7a (diff) | |
Merge branch 'changes-bar-sticky-fix' into 'master'
Fixes the diff changes buttons from toggling when scrolling
Closes #36698
See merge request !13894
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/sticky.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/sticky.js b/app/assets/javascripts/lib/utils/sticky.js index ff2b66046b4..283c0ec0410 100644 --- a/app/assets/javascripts/lib/utils/sticky.js +++ b/app/assets/javascripts/lib/utils/sticky.js @@ -1,5 +1,5 @@ export const isSticky = (el, scrollY, stickyTop) => { - const top = el.offsetTop - scrollY; + const top = Math.floor(el.offsetTop - scrollY); if (top <= stickyTop) { el.classList.add('is-stuck'); diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 5a9b3d19f84..3b3620fe61b 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -253,6 +253,7 @@ import bp from './breakpoints'; loadDiff(source) { if (this.diffsLoaded) { + document.dispatchEvent(new CustomEvent('scroll')); return; } |