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

feat: added a new “window” property, so that Impetus can be applied to child iframes #32

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

feat: added a new “window” property, so that Impetus can be applied to child iframes #32

Show file tree
Hide file tree
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
34 changes: 18 additions & 16 deletions dist/impetus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
var bounceDeceleration = 0.04;
var bounceAcceleration = 0.11;

// fixes weird safari 10 bug where preventDefault is prevented
// @see https://github.com/metafizzy/flickity/issues/457#issuecomment-254501356
window.addEventListener('touchmove', function () {});

var Impetus = function Impetus(_ref) {
var _ref$window = _ref.window;
var win = _ref$window === undefined ? window : _ref$window;
var _ref$source = _ref.source;
var sourceEl = _ref$source === undefined ? document : _ref$source;
var sourceEl = _ref$source === undefined ? window : _ref$source;
var updateCallback = _ref.update;
var _ref$multiplier = _ref.multiplier;
var multiplier = _ref$multiplier === undefined ? 1 : _ref$multiplier;
Expand All @@ -49,11 +47,15 @@
var decelerating = false;
var trackingPoints = [];

// fixes weird safari 10 bug where preventDefault is prevented
// @see https://github.com/metafizzy/flickity/issues/457#issuecomment-254501356
win.addEventListener('touchmove', function () {});

/**
* Initialize instance
*/
(function init() {
sourceEl = typeof sourceEl === 'string' ? document.querySelector(sourceEl) : sourceEl;
sourceEl = typeof sourceEl === 'string' ? win.document.querySelector(sourceEl) : sourceEl;
if (!sourceEl) {
throw new Error('IMPETUS: source not found.');
}
Expand Down Expand Up @@ -210,11 +212,11 @@
addTrackingPoint(pointerLastX, pointerLastY);

// @see https://developers.google.com/web/updates/2017/01/scrolling-intervention
document.addEventListener('touchmove', onMove, getPassiveSupported() ? { passive: false } : false);
document.addEventListener('touchend', onUp);
document.addEventListener('touchcancel', stopTracking);
document.addEventListener('mousemove', onMove, getPassiveSupported() ? { passive: false } : false);
document.addEventListener('mouseup', onUp);
win.addEventListener('touchmove', onMove, getPassiveSupported() ? { passive: false } : false);
win.addEventListener('touchend', onUp);
win.addEventListener('touchcancel', stopTracking);
win.addEventListener('mousemove', onMove, getPassiveSupported() ? { passive: false } : false);
win.addEventListener('mouseup', onUp);
}
}

Expand Down Expand Up @@ -254,11 +256,11 @@
addTrackingPoint(pointerLastX, pointerLastY);
startDecelAnim();

document.removeEventListener('touchmove', onMove);
document.removeEventListener('touchend', onUp);
document.removeEventListener('touchcancel', stopTracking);
document.removeEventListener('mouseup', onUp);
document.removeEventListener('mousemove', onMove);
win.removeEventListener('touchmove', onMove);
win.removeEventListener('touchend', onUp);
win.removeEventListener('touchcancel', stopTracking);
win.removeEventListener('mouseup', onUp);
win.removeEventListener('mousemove', onMove);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion dist/impetus.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/impetus.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading