Skip to content

Commit

Permalink
v1.0.25
Browse files Browse the repository at this point in the history 
- now supporting to jQuery v1.4+ from 1.6+
- updated changelog
- rolled back jQuery versions in all demos/benchmarks
  • Loading branch information
@marcwhitbread
marcwhitbread committed Aug 1, 2012
1 parent cf666f8 commit 1935a99
Show file tree
Hide file tree
Showing 16 changed files with 204 additions and 59 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
@@ -1,8 +1,9 @@
<h1>Changelog</h1>

<h4>2012/07/17 - v1.0.23</h4>
<h4>2012/07/31 - v1.0.25</h4>

<ul>
<li>Improved jQuery support from 1.6+ to 1.4+</li>
<li>Added public methods: <em>lock</em>, <em>unlock</em></li>
<li>Added options: <em>stageCSS</em>, <em>sliderCSS</em></li>
<li>Added options: <em>scrollbarDrag</em>, <em>scrollbarElasticPullResistance</em></li>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_benchmarks/_android/index.html
View file
Expand Up @@ -13,7 +13,7 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- JS -->
<script src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script src = "../../../_lib/jquery-1.4.min.js"></script>
<script src = "../../../_lib/jquery.easing-1.3.js"></script>
<script src = "../../../_src/jquery.iosslider.js"></script>
<!-- <script src = "../_src/jquery.iosslider.min.js"></script> -->
Expand Down
2 changes: 1 addition & 1 deletion _demos/_benchmarks/_general/index.html
View file
Expand Up @@ -13,7 +13,7 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- JS -->
<script src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script src = "../../../_lib/jquery-1.4.min.js"></script>
<script src = "../../../_lib/jquery.easing-1.3.js"></script>
<script src = "../../../_src/jquery.iosslider.js"></script>
<script src = "_js/common.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/1-Default/index.html
View file
Expand Up @@ -48,7 +48,7 @@
</style>

<!-- jQuery library -->
<script type="text/javascript" src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>

<!-- iosSlider plugin -->
<script src = "../../../_src/jquery.iosslider.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/2-Rotating-Banner/index.html
View file
Expand Up @@ -102,7 +102,7 @@
</style>

<!-- jQuery library -->
<script type="text/javascript" src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery.easing-1.3.js"></script>

<!-- iosSlider plugin -->
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/3-Photo-Gallery/index.html
View file
Expand Up @@ -129,7 +129,7 @@
</style>

<!-- jQuery library -->
<script type="text/javascript" src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>

<!-- iosSlider plugin -->
<script src = "../../../_src/jquery.iosslider.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/4-Embedded-HTML/index.html
View file
Expand Up @@ -157,7 +157,7 @@
</style>

<!-- jQuery library -->
<script type="text/javascript" src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>

<!-- iosSlider plugin -->
<script src = "../../../_src/jquery.iosslider.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/5-Double-Slider-Gallery/index.html
View file
Expand Up @@ -169,7 +169,7 @@
</style>

<!-- jQuery library -->
<script type="text/javascript" src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>

<!-- iosSlider plugin -->
<script src = "../../../_src/jquery.iosslider.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/6-Double-Slider-2/index.html
View file
Expand Up @@ -13,7 +13,7 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- JS -->
<script src = "../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>
<script src = "../../_lib/jquery.easing-1.3.js"></script>

<!-- iosSlider plugin -->
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/7-Centered-Slides/index.html
View file
Expand Up @@ -13,7 +13,7 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- JS -->
<script src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script src = "../../../_lib/jquery-1.4.min.js"></script>
<script src = "../../../_lib/jquery.easing-1.3.js"></script>

<!-- iosSlider plugin -->
Expand Down
2 changes: 1 addition & 1 deletion _demos/_examples/8-Full-Hieght-Plus-Footer/index.html
View file
Expand Up @@ -13,7 +13,7 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- JS -->
<script src = "../../../_lib/jquery-1.6.1.min.js"></script>
<script src = "../../../_lib/jquery-1.4.min.js"></script>
<script src = "../../../_lib/jquery.easing-1.3.js"></script>

<!-- iosSlider plugin -->
Expand Down
3 changes: 2 additions & 1 deletion _demos/_site-demo/index.html
View file
Expand Up @@ -13,7 +13,8 @@
<link rel = "stylesheet" media = "screen" href = "_css/common.css" />

<!-- jQuery library -->
<script type="text/javascript" src = "../../_lib/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src = "../../../_lib/jquery-1.4.min.js"></script>

<script src = "../../_lib/jquery.easing-1.3.js"></script>

<!-- iosSlider plugin -->
Expand Down
151 changes: 151 additions & 0 deletions _lib/jquery-1.4.min.js
View file

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions _lib/jquery-1.6.1.min.js
View file

This file was deleted.

59 changes: 33 additions & 26 deletions _src/jquery.iosslider.js
View file
Expand Up @@ -6,8 +6,11 @@
*
* Copyright (c) 2012 Marc Whitbread
*
* Version: v1.0.24 (07/27/2012)
* Requires: jQuery v1.6+
* Version: v1.0.25 (07/31/2012)
* Minimum requirements: jQuery v1.4+
*
* Advanced requirements:
* 1) jQuery bind() click event override on slide requires jQuery v1.6+
*
* Terms of use:
*
Expand Down Expand Up @@ -177,7 +180,7 @@
xScrollDistance = maxSlideVelocity;
}

if(!$(node).is($(currentEventNode))) {
if(!($(node)[0] === $(currentEventNode)[0])) {
snapDirection = snapDirection * -1;
xScrollDistance = xScrollDistance * -2;
}
Expand Down Expand Up @@ -1144,7 +1147,7 @@

if($(settings.unselectableSelector).filter(e.target).length == 1) return false;

currentEventNode = $(this).is($(scrollbarNode)) ? scrollbarNode : scrollerNode;
currentEventNode = ($(this)[0] === $(scrollbarNode)[0]) ? scrollbarNode : scrollerNode;

if((!isIe7) && (!isIe8)) {
var e = e.originalEvent;
Expand Down Expand Up @@ -1328,8 +1331,8 @@
if(xScrollStarted && !preventXScroll) {

var scrollPosition = helpers.getSliderOffset(scrollerNode, 'x');
var scrollbarMultiplier = $(this).is($(scrollbarBlockNode)) ? (-1 * (sliderMax) / (scrollbarStageWidth - scrollMargin - scrollbarWidth)) : 1;
var elasticPullResistance = $(this).is($(scrollbarBlockNode)) ? settings.scrollbarElasticPullResistance : settings.elasticPullResistance;
var scrollbarMultiplier = ($(this)[0] === $(scrollbarBlockNode)[0]) ? (-1 * (sliderMax) / (scrollbarStageWidth - scrollMargin - scrollbarWidth)) : 1;
var elasticPullResistance = ($(this)[0] === $(scrollbarBlockNode)[0]) ? settings.scrollbarElasticPullResistance : settings.elasticPullResistance;

if(isTouch) {
if(currentTouches != e.touches.length) {
Expand Down Expand Up @@ -1456,31 +1459,35 @@
}

});

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

$(scrollerNode).children(':eq(' + activeChildOffsets[sliderNumber] + ')').find('*').each(function() {

var clickObject = $(this).data('events');

$(scrollerNode).children(':eq(' + activeChildOffsets[sliderNumber] + ')').find('*').each(function() {

var clickObject = $(this).data('events');

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

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

if(clickObject.click[0].namespace != 'iosSliderEvent') {
if(!xScrollStarted) {
return false;
}

if(!xScrollStarted) {
return false;
$(this).one('click.disableClick', helpers.preventClick);
var handlers = $(this).data('events').click;
var handler = handlers.pop();
handlers.splice(0, 0, handler);

}

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

}

}
}

});

});

}

if(!isEventCleared[sliderNumber]) {

Expand All @@ -1493,7 +1500,7 @@
if(currentSlider == undefined) {
return false;
}

helpers.slowScrollHorizontal(currentSlider, scrollTimeouts, sliderMax, scrollbarClass, xScrollDistance, yScrollDistance, scrollbarWidth, stageWidth, scrollbarStageWidth, scrollMargin, scrollBorder, childrenOffsets, sliderNumber, infiniteSliderOffset, infiniteSliderWidth, numberOfSlides, currentEventNode, settings);

currentSlider = undefined;
Expand Down
9 changes: 6 additions & 3 deletions _src/jquery.iosslider.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 1935a99

Please sign in to comment.