diff options
| author | Mario Vavti <mario@mariovavti.com> | 2022-03-29 11:42:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2022-03-29 11:42:53 +0200 |
| commit | 0784cd593a39a4fc297e8a82f7e79bc8019a0868 (patch) | |
| tree | 22182afb37cf460f8208fff9d276a0672add3185 /view/theme/redbasic/js/redbasic.js | |
| parent | 0e2e9321025f87fe9587f3d183adaea6185e4e20 (diff) | |
| parent | 9c5d2ee5630dd7033904039dcd1e92db8821b644 (diff) | |
| download | volse-hubzilla-0784cd593a39a4fc297e8a82f7e79bc8019a0868.tar.gz volse-hubzilla-0784cd593a39a4fc297e8a82f7e79bc8019a0868.tar.bz2 volse-hubzilla-0784cd593a39a4fc297e8a82f7e79bc8019a0868.zip | |
Merge branch '7.2RC'7.2
Diffstat (limited to 'view/theme/redbasic/js/redbasic.js')
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c0c03d4f8..04469cb85 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -17,8 +17,13 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element - stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0); - stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20); + if (document.querySelector('#region_1')) { + stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0); + } + + if (document.querySelector('#region_3')) { + stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20); + } $('#expand-aside').on('click', function() { if($('main').hasClass('region_1-on')){ @@ -121,8 +126,14 @@ function setStyle(element, cssProperty) { } function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) { + var lastScrollTop = 0; var sticky = document.querySelector(sticky); + + if (!sticky) { + return; + } + var stickyHeight = sticky.getBoundingClientRect().height; var stickyTop = document.querySelector(stickyTop); var content = document.querySelector(container); |