Skip to content
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

fixed bubbling issue - still testing #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed bubbling issue - still testing #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions infinite-slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@
setAllowClick(true);
endHandler = function(event) {
var el;
if (event) {
event.stopPropagation();
event.cancelBubble = true;
}
if (!allowClick) {
event.preventDefault();
if (interactionStart === null || (Math.abs(interactionCurrent.x - interactionStart.x) < clickFudge && Math.abs(interactionCurrent.y - interactionStart.y) < clickFudge)) {
Expand Down Expand Up @@ -208,9 +212,6 @@
interactionCurrent.y += dy;
}
}
// had to add this to avoid getting undefined at line 211 when overlaying and clicking google maps
// this seems like a hack, if you know of a better solution please delete this.
// *** start of added code - didn't think about y, added it, thanks
if (!interactionStart && !interactionCurrent) {
interactionStart = interactionCurrent = { x: 0, y:0};

Expand All @@ -219,7 +220,6 @@
} else if (interactionStart && !interactionCurrent) {
interactionCurrent = interactionStart;
}
// ** end of added code
xCont = elementStartX + (interactionCurrent.x - interactionStart.x);
return doTransform();
};
Expand Down