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

Jump to bottom

Make 'open' and 'close' events more intuitive #1

Closed
wants to merge 3 commits into from
Closed

Make 'open' and 'close' events more intuitive #1

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
357214a
Fix build
kosssi Sep 20, 2016
2057b08
Add npm command to build or watch
kosssi Sep 20, 2016
554746e
Make 'open' and 'close' events more intuitive
kosssi Sep 20, 2016
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
36 changes: 18 additions & 18 deletions dist/snap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
}
},
easeCallback: function easeCallback() {
utils.events.removeEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
settings.element.style[cache.vendor + 'Transition'] = '';
cache.translation = action.translate.get.matrix(4);
cache.easing = false;
Expand All @@ -197,10 +198,12 @@
if (cache.easingTo === 0) {
utils.klass.remove(document.body, 'snapjs-right');
utils.klass.remove(document.body, 'snapjs-left');
utils.dispatchEvent('close');
} else {
utils.dispatchEvent('open');
}

utils.dispatchEvent('animated');
utils.events.removeEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
},
easeTo: function easeTo(n) {
cache.easing = true;
Expand Down Expand Up @@ -455,7 +458,6 @@

// Tap Close
if (cache.dragWatchers.current === 0 && translated !== 0 && settings.tapToClose) {
utils.dispatchEvent('close');
utils.events.prevent(e);
action.translate.easeTo(0);
cache.isDragging = false;
Expand All @@ -476,24 +478,24 @@
action.translate.easeTo(settings.maxPosition); // Open Left
}
} else {
action.translate.easeTo(0); // Close Left
}
action.translate.easeTo(0); // Close Left
}
// Revealing Right
} else if (cache.simpleStates.opening === 'right') {
// Halfway, Flicking, or Too Far Out
if (cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick) {
if (cache.simpleStates.flick && cache.simpleStates.towards === 'right') {
// Flicking Closed
action.translate.easeTo(0);
} else if (cache.simpleStates.flick && cache.simpleStates.towards === 'left' || // Flicking Open OR
cache.simpleStates.halfway || cache.simpleStates.hyperExtending // At least halfway open OR hyperextending
) {
action.translate.easeTo(settings.minPosition); // Open Right
}
} else {
action.translate.easeTo(0); // Close Right
// Halfway, Flicking, or Too Far Out
if (cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick) {
if (cache.simpleStates.flick && cache.simpleStates.towards === 'right') {
// Flicking Closed
action.translate.easeTo(0);
} else if (cache.simpleStates.flick && cache.simpleStates.towards === 'left' || // Flicking Open OR
cache.simpleStates.halfway || cache.simpleStates.hyperExtending // At least halfway open OR hyperextending
) {
action.translate.easeTo(settings.minPosition); // Open Right
}
} else {
action.translate.easeTo(0); // Close Right
}
}
cache.isDragging = false;
cache.startDragX = utils.page('X', e);
}
Expand All @@ -517,7 +519,6 @@
* Public
*/
this.open = function (side) {
utils.dispatchEvent('open');
utils.klass.remove(document.body, 'snapjs-expand-left');
utils.klass.remove(document.body, 'snapjs-expand-right');

Expand All @@ -536,7 +537,6 @@
}
};
this.close = function () {
utils.dispatchEvent('close');
action.translate.easeTo(0);
};
this.expand = function (side) {
Expand Down
Loading