Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
v1.1.22
- updated min/js
- added jquery versions 1.7/1.8 for testing of some versioning issues.
  • Loading branch information
marcwhitbread committed Oct 20, 2012
1 parent 86e165d commit a4b9f73
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
4 changes: 3 additions & 1 deletion _demos/_benchmarks/_general/index.html
Expand Up @@ -13,7 +13,9 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" /> <link rel = "stylesheet" media = "screen" href = "_css/common.css" />


<!-- JS --> <!-- JS -->
<script src = "../../../_lib/jquery-1.4.min.js"></script> <!-- <script src = "../../../_lib/jquery-1.4.min.js"></script> -->
<!-- <script src = "../../../_lib/jquery-1.7.min.js"></script> -->
<script src = "../../../_lib/jquery-1.8.2.min.js"></script>
<script src = "../../../_lib/jquery.easing-1.3.js"></script> <script src = "../../../_lib/jquery.easing-1.3.js"></script>
<script src = "../../../_src/jquery.iosslider.js"></script> <script src = "../../../_src/jquery.iosslider.js"></script>
<script src = "_js/common.js"></script> <script src = "_js/common.js"></script>
Expand Down
4 changes: 4 additions & 0 deletions _lib/jquery-1.7.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions _lib/jquery-1.8.2.min.js

Large diffs are not rendered by default.

32 changes: 30 additions & 2 deletions _src/jquery.iosslider.js
Expand Up @@ -6,7 +6,7 @@
* *
* Copyright (c) 2012 Marc Whitbread * Copyright (c) 2012 Marc Whitbread
* *
* Version: v1.1.21 (10/18/2012) * Version: v1.1.22 (10/20/2012)
* Minimum requirements: jQuery v1.4+ * Minimum requirements: jQuery v1.4+
* *
* Advanced requirements: * Advanced requirements:
Expand Down Expand Up @@ -1991,7 +1991,34 @@


}); });


if(parseFloat($().jquery) >= 1.6) { if(parseFloat($().jquery) >= 1.8) {

allScrollerNodeChildren.each(function() {

var clickObject = $._data(this, 'events');

if(clickObject != undefined) {
if(clickObject.click != undefined) {

if(clickObject.click[0].namespace != 'iosSliderEvent') {

if(!xScrollStarted) {
return false;
}

$(this).one('click.disableClick', helpers.preventClick);
var handlers = $._data(this, 'events').click;
var handler = handlers.pop();
handlers.splice(0, 0, handler);

}

}
}

});

} else if(parseFloat($().jquery) >= 1.6) {


allScrollerNodeChildren.each(function() { allScrollerNodeChildren.each(function() {


Expand All @@ -2018,6 +2045,7 @@


}); });


} else {
} }


if(!isEventCleared[sliderNumber]) { if(!isEventCleared[sliderNumber]) {
Expand Down
4 changes: 2 additions & 2 deletions _src/jquery.iosslider.min.js

Large diffs are not rendered by default.

0 comments on commit a4b9f73

Please sign in to comment.