Skip to content

Commit

Permalink
v1.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@taye
taye committed Jan 2, 2018
1 parent 0ac7ef7 commit 8796735
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 74 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#line25">line 25</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line26">line 26</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#line177">line 177</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line179">line 179</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#line161">line 161</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line163">line 163</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#line194">line 194</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line196">line 196</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#line91">line 91</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line93">line 93</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#line263">line 263</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line265">line 265</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#line232">line 232</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line234">line 234</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#line149">line 149</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line151">line 151</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#line109">line 109</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line111">line 111</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#line292">line 292</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line294">line 294</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#line333">line 333</a>
<a href="src_Interactable.js.html">src/Interactable.js</a>, <a href="src_Interactable.js.html#line335">line 335</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.

14 changes: 8 additions & 6 deletions dist/docs/src_Interactable.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ <h1 class="page-title">src/Interactable.js</h1>

<section>
<article>
<pre class="prettyprint source linenums"><code>const is = require('./utils/is');
<pre class="prettyprint source linenums"><code>const clone = require('./utils/clone');
const is = require('./utils/is');
const events = require('./utils/events');
const extend = require('./utils/extend');
const actions = require('./actions/base');
Expand Down Expand Up @@ -106,8 +107,9 @@ <h1 class="page-title">src/Interactable.js</h1>
if (option in defaults[action]) {
// if the option in the options arg is an object value
if (is.object(options[option])) {
// duplicate the object
this.options[action][option] = extend(this.options[action][option] || {}, options[option]);
// duplicate the object and merge
this.options[action][option] = clone(this.options[action][option] || {});
extend(this.options[action][option], options[option]);

if (is.object(defaults.perAction[option]) &amp;&amp; 'enabled' in defaults.perAction[option]) {
this.options[action][option].enabled = options[option].enabled === false? false : true;
Expand Down Expand Up @@ -337,14 +339,14 @@ <h1 class="page-title">src/Interactable.js</h1>
options = {};
}

this.options = extend({}, defaults.base);
this.options = clone(defaults.base);

const perActions = extend({}, defaults.perAction);
const perActions = clone(defaults.perAction);

for (const actionName in actions.methodDict) {
const methodName = actions.methodDict[actionName];

this.options[actionName] = extend({}, defaults[actionName]);
this.options[actionName] = clone(defaults[actionName]);

this.setPerAction(actionName, perActions);

Expand Down
Loading

0 comments on commit 8796735

Please sign in to comment.