Skip to content

Fixes next button not showing when showNext is set to true #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes next button not showing when showNext is set to true #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1eb8863
Allow specyfing element to scroll, instead of always using the docume…
Jan 11, 2021
5ab8e20
#1 show next button whenever showNext parameter is set to true
Jan 11, 2021
d50e21c
propagate changes to the right source file
Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions enjoyhint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
onEnd: function() {},

onSkip: function() {},

onNext: function() {}

onNext: function () { },

elementToScroll: document.body
};

var options = $.extend(defaults, _options);
Expand Down Expand Up @@ -62,7 +64,8 @@
options.onSkip();
skipAll();
},
fill: SHAPE_BACKGROUND_COLOR
fill: SHAPE_BACKGROUND_COLOR,
elementToScroll: options.elementToScroll
});
};

Expand Down Expand Up @@ -154,7 +157,7 @@
var isHintInViewport = $(step_data.selector).get(0).getBoundingClientRect();
if(isHintInViewport.top < 0 || isHintInViewport.bottom > (window.innerHeight || document.documentElement.clientHeight)){
hideCurrentHint();
$(document.body).scrollTo(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -200});
$(options.elementToScroll).scrollTo(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -200});
}
else {
// if previous button has been clicked and element are in viewport to prevent custom step scrollAnimationSpeed set scrollSpeed to default
Expand Down Expand Up @@ -186,6 +189,9 @@
if (step_data.showNext !== true) {
$body.enjoyhint("hide_next");
}
else {
$body.enjoyhint("show_next");
}

$body.enjoyhint("hide_prev");

Expand Down Expand Up @@ -1437,10 +1443,10 @@
else {
distance = initial_distance;
ver_button_position = initial_ver_position;
that.$next_btn.html(customBtnProps.nextButton && customBtnProps.nextButton.text ?
customBtnProps.nextButton.text : 'Next');
that.$prev_btn.html(customBtnProps.prevButton && customBtnProps.prevButton.text ?
customBtnProps.prevButton.text : 'Previous');
that.$next_btn.html(customBtnProps.nextButton && customBtnProps.nextButton.text ?
customBtnProps.nextButton.text : 'Next');
that.$prev_btn.html(customBtnProps.prevButton && customBtnProps.prevButton.text ?
customBtnProps.prevButton.text : 'Previous');
}

that.$prev_btn.css({
Expand Down
Loading