Skip to content

Commit

Permalink
Updated docs, min and bumped version number
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattbryson
mattbryson committed Feb 2, 2015
1 parent b70865e commit 9e18d87
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 44 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-touchswipe",
"version": "1.6.7",
"version": "1.6.8",
"main": "./jquery.touchSwipe.js",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion docs/files.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h1 class="classTitle">File Index</h1>
</div>
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:41 GMT-0000 (GMT)</p>
</footer>
<script type="text/javascript">
<!--
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ <h1 class="classTitle">Class Index</h1>
</div>
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:41 GMT-0000 (GMT)</p>
</footer>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h3>Constructor</h3>
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.defaults.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ <h4>Instance Properties<span class="jsdoc-inherits-caption pull-right">Defined B
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.directions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ <h4>Instance Properties<span class="jsdoc-inherits-caption pull-right">Defined B
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.fingers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ <h4>Instance Properties<span class="jsdoc-inherits-caption pull-right">Defined B
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ <h3>Events<span class="jsdoc-inherits-caption pull-right">Defined By</span></h3>
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.pageScroll.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ <h4>Instance Properties<span class="jsdoc-inherits-caption pull-right">Defined B
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.fn.swipe.phases.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ <h4>Instance Properties<span class="jsdoc-inherits-caption pull-right">Defined B
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/$.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h3>Constructor</h3>
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
2 changes: 1 addition & 1 deletion docs/symbols/_global_.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div></body>
</html>
71 changes: 41 additions & 30 deletions docs/symbols/src/jquery.touchSwipe.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@
// get the total number of fingers touching the screen
fingerCount = event.touches.length;
}
//Else this is the desktop, so stop the browser from dragging the image
//Else this is the desktop, so stop the browser from dragging content
else {
jqEvent.preventDefault(); //call this on jq event so we are cross browser
}
Expand Down Expand Up @@ -756,6 +756,8 @@
}




if ( (fingerCount === options.fingers || options.fingers === ALL_FINGERS) || !SUPPORTS_TOUCH || hasPinches() ) {

direction = calculateDirection(currentFinger.start, currentFinger.end);
Expand Down Expand Up @@ -972,34 +974,38 @@

var ret = undefined;

// SWIPE GESTURES
if(didSwipe() || hasSwipes()) { //hasSwipes as status needs to fire even if swipe is invalid
//Trigger the swipe events...
ret = triggerHandlerForGesture(event, phase, SWIPE);
}

// PINCH GESTURES (if the above didn't cancel)
else if((didPinch() || hasPinches()) &amp;&amp; ret!==false) {
//Trigger the pinch events...
ret = triggerHandlerForGesture(event, phase, PINCH);
}

// CLICK / TAP (if the above didn't cancel)
if(didDoubleTap() &amp;&amp; ret!==false) {
//Trigger the tap events...
ret = triggerHandlerForGesture(event, phase, DOUBLE_TAP);
}

// CLICK / TAP (if the above didn't cancel)
else if(didLongTap() &amp;&amp; ret!==false) {
//Trigger the tap events...
ret = triggerHandlerForGesture(event, phase, LONG_TAP);
}
//Swipes and pinches are not mutually exclusive - can happend at same time, so need to trigger 2 events potentially
if( (didSwipe() || hasSwipes()) || (didPinch() || hasPinches()) ) {
// SWIPE GESTURES
if(didSwipe() || hasSwipes()) { //hasSwipes as status needs to fire even if swipe is invalid
//Trigger the swipe events...
ret = triggerHandlerForGesture(event, phase, SWIPE);
}

// PINCH GESTURES (if the above didn't cancel)
if((didPinch() || hasPinches()) &amp;&amp; ret!==false) {
//Trigger the pinch events...
ret = triggerHandlerForGesture(event, phase, PINCH);
}
} else {

// CLICK / TAP (if the above didn't cancel)
if(didDoubleTap() &amp;&amp; ret!==false) {
//Trigger the tap events...
ret = triggerHandlerForGesture(event, phase, DOUBLE_TAP);
}

// CLICK / TAP (if the above didn't cancel)
else if(didLongTap() &amp;&amp; ret!==false) {
//Trigger the tap events...
ret = triggerHandlerForGesture(event, phase, LONG_TAP);
}

// CLICK / TAP (if the above didn't cancel)
else if(didTap() &amp;&amp; ret!==false) {
//Trigger the tap event..
ret = triggerHandlerForGesture(event, phase, TAP);
// CLICK / TAP (if the above didn't cancel)
else if(didTap() &amp;&amp; ret!==false) {
//Trigger the tap event..
ret = triggerHandlerForGesture(event, phase, TAP);
}
}


Expand Down Expand Up @@ -1320,7 +1326,12 @@
*/
function validateDefaultEvent(jqEvent, direction) {

if (options.allowPageScroll === NONE || hasPinches() || options.preventDefaultEvents === false) {

if( options.preventDefaultEvents === false ) {
return;
}

if (options.allowPageScroll === NONE) {
jqEvent.preventDefault();
} else {
var auto = options.allowPageScroll === AUTO;
Expand Down Expand Up @@ -2118,7 +2129,7 @@
<!-- ============================== footer ================================= -->
<footer class="footer">

<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 11:00:30 GMT-0000 (GMT)</p>
<p>Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Feb 02 2015 20:04:40 GMT-0000 (GMT)</p>
</footer>
</div>
<script type="text/javascript">
Expand Down
4 changes: 4 additions & 0 deletions jquery.touchSwipe.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
*
* $Date: 2015-22-01 (Thurs, 22 Jan 2015) $
* $version 1.6.7 - Added patch from https://github.com/mattbryson/TouchSwipe-Jquery-Plugin/issues/206 to fix memory leak
*
* $Date: 2015-2-2 (Mon, 2 Feb 2015) $
* $version 1.6.7 - Added preventDefaultEvents option to proxy events regardless.
* - Fixed issue with swipe and pinch not triggering at the same time
*/

/**
Expand Down
Loading

0 comments on commit 9e18d87

Please sign in to comment.