Skip to content

Commit

Permalink
v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@taye
taye committed Nov 25, 2017
1 parent 49d064d commit 4fc5cc9
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 159 deletions.
22 changes: 11 additions & 11 deletions dist/docs/Interactable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h4 class="name" id="Interactable"><span class="type-signature"></span>new Inter

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line24">line 24</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line25">line 25</a>
</li></ul></dd>


Expand Down Expand Up @@ -570,7 +570,7 @@ <h4 class="name" id="context"><span class="type-signature"></span>context<span c

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line176">line 176</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line177">line 177</a>
</li></ul></dd>


Expand Down Expand Up @@ -680,7 +680,7 @@ <h4 class="name" id="deltaSource"><span class="type-signature"></span>deltaSourc

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line160">line 160</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line161">line 161</a>
</li></ul></dd>


Expand Down Expand Up @@ -1291,7 +1291,7 @@ <h4 class="name" id="fire"><span class="type-signature"></span>fire<span class="

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line193">line 193</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line194">line 194</a>
</li></ul></dd>


Expand Down Expand Up @@ -1648,7 +1648,7 @@ <h4 class="name" id="getRect"><span class="type-signature"></span>getRect<span c

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line90">line 90</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line91">line 91</a>
</li></ul></dd>


Expand Down Expand Up @@ -1821,7 +1821,7 @@ <h4 class="name" id="off"><span class="type-signature"></span>off<span class="si

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line262">line 262</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line263">line 263</a>
</li></ul></dd>


Expand Down Expand Up @@ -2073,7 +2073,7 @@ <h4 class="name" id="on"><span class="type-signature"></span>on<span class="sign

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line231">line 231</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line232">line 232</a>
</li></ul></dd>


Expand Down Expand Up @@ -2326,7 +2326,7 @@ <h4 class="name" id="origin"><span class="type-signature"></span>origin<span cla

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line148">line 148</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line149">line 149</a>
</li></ul></dd>


Expand Down Expand Up @@ -2690,7 +2690,7 @@ <h4 class="name" id="rectChecker"><span class="type-signature"></span>rectChecke

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line108">line 108</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line109">line 109</a>
</li></ul></dd>


Expand Down Expand Up @@ -3083,7 +3083,7 @@ <h4 class="name" id="set"><span class="type-signature"></span>set<span class="si

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line291">line 291</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line292">line 292</a>
</li></ul></dd>


Expand Down Expand Up @@ -3422,7 +3422,7 @@ <h4 class="name" id="unset"><span class="type-signature"></span>unset<span class

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line332">line 332</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line333">line 333</a>
</li></ul></dd>


Expand Down
2 changes: 1 addition & 1 deletion dist/docs/doclets.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/docs/module-interact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ <h4 class="name" id=".maxInteractions"><span class="type-signature">(static) </s

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="src_autoStart_base.js.html">src/autoStart/base.js</a>, <a href="src_autoStart_base.js.html#line243">line 243</a>
<a href="src_autoStart_base.js.html">src/autoStart/base.js</a>, <a href="src_autoStart_base.js.html#line224">line 224</a>
</li></ul></dd>


Expand Down
19 changes: 12 additions & 7 deletions dist/docs/src_Interactable.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ <h1 class="page-title">src/Interactable.js</h1>
getElementRect,
nodeContains,
trySelector,
matchesSelector,
} = require('./utils/domUtils');
const { getWindow } = require('./utils/window');
const { contains } = require('./utils/arr');
Expand Down Expand Up @@ -435,16 +436,20 @@ <h1 class="page-title">src/Interactable.js</h1>
return ret &amp;&amp; (is.string(element) || dontCheckInContext || ret.inContext(element))? ret : null;
};

scope.interactables.forEachSelector = function (callback, element) {
scope.interactables.forEachMatch = function (element, callback) {
for (const interactable of this) {
// skip non CSS selector targets and out of context elements
if (!is.string(interactable.target)
|| (element &amp;&amp; !interactable.inContext(element))) {
continue;
let ret;

if ((is.string(interactable.target)
// target is a selector and the element matches
? (is.element(element) &amp;&amp; matchesSelector(element, interactable.target))
// target is the element
: element === interactable.target)
// the element is in context
&amp;&amp; (interactable.inContext(element))) {
ret = callback(interactable);
}

const ret = callback(interactable, interactable.target);

if (ret !== undefined) {
return ret;
}
Expand Down
37 changes: 9 additions & 28 deletions dist/docs/src_autoStart_base.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ <h1 class="page-title">src/autoStart/base.js</h1>
setActionDefaults: function (action) {
utils.extend(action.defaults, autoStart.defaults.perAction);
},
validateAction,
};

// set cursor style on mousedown
Expand Down Expand Up @@ -158,43 +159,23 @@ <h1 class="page-title">src/autoStart/base.js</h1>
let matchElements = [];

let element = eventTarget;
let action = null;

function pushMatches (interactable, selector) {
if (utils.matchesSelector(element, selector)) {

matches.push(interactable);
matchElements.push(element);
}
function pushMatches (interactable) {
matches.push(interactable);
matchElements.push(element);
}

while (utils.is.element(element)) {
matches = [];
matchElements = [];

const elementInteractable = scope.interactables.get(element);
scope.interactables.forEachMatch(element, pushMatches);

if (elementInteractable
&amp;&amp; (action = validateAction(elementInteractable.getAction(pointer, event, interaction, element, eventTarget),
elementInteractable,
element,
eventTarget))
&amp;&amp; !elementInteractable.options[action.name].manualStart) {
return {
element,
action,
target: elementInteractable,
};
}
else {
scope.interactables.forEachSelector(pushMatches, element);
const actionInfo = validateSelector(interaction, pointer, event, matches, matchElements, eventTarget);

const actionInfo = validateSelector(interaction, pointer, event, matches, matchElements, eventTarget);

if (actionInfo.action
&amp;&amp; !actionInfo.target.options[actionInfo.action.name].manualStart) {
return actionInfo;
}
if (actionInfo.action
&amp;&amp; !actionInfo.target.options[actionInfo.action.name].manualStart) {
return actionInfo;
}

element = utils.parentNode(element);
Expand Down
6 changes: 3 additions & 3 deletions dist/docs/src_interactablePreventDefault.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ <h1 class="page-title">src/interactablePreventDefault.js</h1>

// setting === 'auto'

// don't preventDefault if the browser supports passiveEvents
// CSS touch-action and user-selecct should be used instead
if (events.supportsOptions) {
// don't preventDefault of touch{start,move} events if the browser supports passive
// events listeners. CSS touch-action and user-selecct should be used instead
if (events.supportsOptions &amp;&amp; /^touch(start|move)$/.test(event.type)) {
return;
}

Expand Down
Loading

0 comments on commit 4fc5cc9

Please sign in to comment.