Skip to content

issues 15 - allow element instead of selector argument #16

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
SunboX wants to merge 4 commits into
base: master
Choose a base branch
from
Open

issues 15 - allow element instead of selector argument #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee95cf6
issues 15 - allow element instead of selector argument
SunboX Nov 23, 2013
3ec210f
some cleanup
SunboX Nov 23, 2013
2488cff
fixed matchesSelector
SunboX Nov 23, 2013
76e0801
fixed typo
SunboX Nov 23, 2013
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
30 changes: 20 additions & 10 deletions source/tappable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

var abs = Math.abs,
noop = function(){},
dEl = d.documentElement,
matchesSelectorFn = dEl.matchesSelector || dEl.mozMatchesSelector || dEl.webkitMatchesSelector || dEl.oMatchesSelector || dEl.msMatchesSelector,
defaults = {
noScroll: false,
activeClass: 'tappable-active',
Expand Down Expand Up @@ -70,21 +72,29 @@
}
el.className = el.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1');
},
matchesSelector = function(node, selector){
var root = d.documentElement,
matches = root.matchesSelector || root.mozMatchesSelector || root.webkitMatchesSelector || root.oMatchesSelector || root.msMatchesSelector;
return matches.call(node, selector);
matchesSelector = function (node, selector) {
return matchesSelectorFn.call(node, selector);
},
closest = function(node, selector){
var matches = false;
do {
matches = matchesSelector(node, selector);
} while (!matches && (node = node.parentNode) && node.ownerDocument);
return matches ? node : false;
if (typeof selector === 'string') {
var matches = false;
do {
matches = matchesSelector(node, selector);
Copy link
Owner

@cheeaun cheeaun Nov 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this works without .call() ?

Copy link
Author

@SunboX SunboX Nov 23, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really :D just tested it without selectors :/

} while (!matches && (node = node.parentNode) && node.ownerDocument);
return matches ? node : false;
} else {
if (node === selector || selector.contains(node)) {
return selector;
}
return false;
}
};

w.tappable = function(selector, opts){
if (typeof opts == 'function') opts = { onTap: opts };
if (typeof selector === 'undefined') {
return;
}
if (typeof opts === 'function') opts = { onTap: opts };
var options = {};
for (var key in defaults) options[key] = opts[key] || defaults[key];

Expand Down