diff options
| author | Marco Alexander Fischer | 2018-09-04 15:38:04 +0200 |
|---|---|---|
| committer | Marco Alexander Fischer | 2018-09-04 15:38:04 +0200 |
| commit | f53e89752c600fa5cda22aaa659d53b6bfd8300e (patch) | |
| tree | 89ad099504eaa7f51c60b49582c244e20ff0adab /assets | |
| parent | a3803a523504230cafebfd6f5d248f9a9a4eafdd (diff) | |
| parent | b080586bbf21fbb38d21f1f83a0fea28199627fe (diff) | |
Merge branch 'master' of https://github.com/texxme/Texx-Web
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/fullpage.js | 17 | ||||
| -rw-r--r-- | assets/js/main.js | 1 |
2 files changed, 10 insertions, 8 deletions
diff --git a/assets/js/fullpage.js b/assets/js/fullpage.js index c499a4c..86b95bb 100644 --- a/assets/js/fullpage.js +++ b/assets/js/fullpage.js @@ -279,8 +279,6 @@ if (settings.useSlideNumbers) { if (fadeInOut) { $('#' + settings.slideNumbersContainer).fadeIn(); - } else { - $('#' + settings.slideNumbersContainer).fadeOut(); } } } @@ -521,11 +519,16 @@ * ============================================================================ */ $.fn.scrollTo = function (element) { if (element !== last) { - $("body,html").stop(true, true).animate({ - scrollTop: $(element).offset().top - }, { - duration: 375 - }); + try { + $("body,html").stop(true, true).animate({ + scrollTop: $(element).offset().top + }, { + duration: 375 + }); + } catch (e) { + $(".paginate:first").click(); + } + } else { $("body,html").stop(true, true).animate({ scrollTop: $(document).outerHeight() - windowHeight diff --git a/assets/js/main.js b/assets/js/main.js index 5e06d0d..8c21b21 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -7,6 +7,5 @@ $(document).ready(() => { slideNumbersColor: 'transparent', bodyContainer: 'pageWrapper', }); - $(".ScrollDown").click(() => $(".paginate:nth-of-type(2n)").click()); });
\ No newline at end of file |