Skip to content

Commit

Permalink
4.0.0-beta.4
Browse files Browse the repository at this point in the history
  • Loading branch information
nolimits4web committed Sep 20, 2017
1 parent 5c9c161 commit 07a2b5d
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 48 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## Swiper 4.0.0-beta.4 - Released on September 20, 2017
* Fixed issue with draggable Scrollbar in RTL layout
* Minor fixes

## Swiper 4.0.0-beta.3 - Released on September 13, 2017
* Dom7 update to latest version
* Small core refactoring to get better results within tree-shaking bundles
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "https://github.com/nolimits4web/Swiper.git"
},
"description": "Most modern mobile touch slider and framework with hardware accelerated transitions",
"version": "4.0.0-beta.2",
"version": "4.0.0-beta.3",
"author": "Vladimir Kharlampidi",
"homepage": "http://www.idangero.us/swiper/",
"keywords": ["swiper", "swipe", "slider", "touch", "ios", "mobile", "cordova", "phonegap", "app", "framework", "carousel", "gallery"],
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "swiper",
"repo": "https://github.com/nolimits4web/Swiper.git",
"description": "Most modern mobile touch slider and framework with hardware accelerated transitions",
"version": "4.0.0-beta.2",
"version": "4.0.0-beta.3",
"keywords": ["swiper", "swipe", "slider", "touch", "ios", "mobile", "cordova", "phonegap", "app", "framework", "carousel", "gallery"],
"dependencies": {
},
Expand Down
4 changes: 2 additions & 2 deletions dist/css/swiper.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* Swiper 4.0.0-beta.3
* Swiper 4.0.0-beta.4
* Most modern mobile touch slider and framework with hardware accelerated transitions
* http://www.idangero.us/swiper/
*
* Copyright 2014-2017 Vladimir Kharlampidi
*
* Released under the MIT License
*
* Released on: September 13, 2017
* Released on: September 20, 2017
*/
.swiper-container {
margin-left: auto;
Expand Down
4 changes: 2 additions & 2 deletions dist/css/swiper.min.css

Large diffs are not rendered by default.

31 changes: 19 additions & 12 deletions dist/js/swiper.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* Swiper 4.0.0-beta.3
* Swiper 4.0.0-beta.4
* Most modern mobile touch slider and framework with hardware accelerated transitions
* http://www.idangero.us/swiper/
*
* Copyright 2014-2017 Vladimir Kharlampidi
*
* Released under the MIT License
*
* Released on: September 13, 2017
* Released on: September 20, 2017
*/

(function (global, factory) {
Expand Down Expand Up @@ -1525,7 +1525,7 @@ var updateSlides = function () {
.attr('data-swiper-column', column)
.attr('data-swiper-row', row);
}
if (slide.css('display') === 'none') { continue; }
if (slide.css('display') === 'none') { continue; } // eslint-disable-line
if (params.slidesPerView === 'auto') {
slideSize = swiper.isHorizontal() ? slide.outerWidth(true) : slide.outerHeight(true);
if (params.roundLengths) { slideSize = Math.floor(slideSize); }
Expand Down Expand Up @@ -2161,6 +2161,8 @@ var slideNext = function (speed, runCallbacks, internal) {
if (params.loop) {
if (animating) { return false; }
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
Expand All @@ -2178,6 +2180,8 @@ var slidePrev = function (speed, runCallbacks, internal) {
if (params.loop) {
if (animating) { return false; }
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
Expand Down Expand Up @@ -2354,7 +2358,7 @@ var appendSlide = function (slides) {
if (params.loop) {
swiper.loopDestroy();
}
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (var i = 0; i < slides.length; i += 1) {
if (slides[i]) { $wrapperEl.append(slides[i]); }
}
Expand All @@ -2379,7 +2383,7 @@ var prependSlide = function (slides) {
swiper.loopDestroy();
}
var newActiveIndex = activeIndex + 1;
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (var i = 0; i < slides.length; i += 1) {
if (slides[i]) { $wrapperEl.prepend(slides[i]); }
}
Expand Down Expand Up @@ -2409,7 +2413,7 @@ var removeSlide = function (slidesIndexes) {
var newActiveIndex = activeIndex;
var indexToRemove;

if (typeof slidesIndexes === 'object' && slidesIndexes.length) {
if (typeof slidesIndexes === 'object' && 'length' in slidesIndexes) {
for (var i = 0; i < slidesIndexes.length; i += 1) {
indexToRemove = slidesIndexes[i];
if (swiper.slides[indexToRemove]) { swiper.slides.eq(indexToRemove).remove(); }
Expand Down Expand Up @@ -2470,8 +2474,8 @@ var Device = (function Device() {
phonegap: win.cordova || win.phonegap,
};

var windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/);
var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
var windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/); // eslint-disable-line
var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/); // eslint-disable-line
var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
var iphone = !ipad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
Expand Down Expand Up @@ -4205,14 +4209,14 @@ var Mousewheel = {
if (params.forceToAxis) {
if (swiper.isHorizontal()) {
if (Math.abs(data.pixelX) > Math.abs(data.pixelY)) { delta = data.pixelX * rtlFactor; }
else { return; }
else { return true; }
} else if (Math.abs(data.pixelY) > Math.abs(data.pixelX)) { delta = data.pixelY; }
else { return; }
else { return true; }
} else {
delta = Math.abs(data.pixelX) > Math.abs(data.pixelY) ? -data.pixelX * rtlFactor : -data.pixelY;
}

if (delta === 0) { return; }
if (delta === 0) { return true; }

if (params.invert) { delta = -delta; }

Expand Down Expand Up @@ -4262,7 +4266,7 @@ var Mousewheel = {
if (swiper.params.autoplay && swiper.params.autoplayDisableOnInteraction) { swiper.stopAutoplay(); }

// Return page scroll on edge positions
if (position === 0 || position === swiper.maxTranslate()) { return; }
if (position === 0 || position === swiper.maxTranslate()) { return true; }
}

if (e.preventDefault) { e.preventDefault(); }
Expand Down Expand Up @@ -4882,6 +4886,9 @@ var Scrollbar = {
} else if (position > positionMax) {
position = positionMax;
}
if (swiper.rtl) {
position = positionMax - position;
}
position = -position / moveDivider;
swiper.updateProgress(position);
swiper.setTranslate(position);
Expand Down
6 changes: 3 additions & 3 deletions dist/js/swiper.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/swiper.min.js.map

Large diffs are not rendered by default.

31 changes: 19 additions & 12 deletions dist/js/swiper.modular.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* Swiper 4.0.0-beta.3
* Swiper 4.0.0-beta.4
* Most modern mobile touch slider and framework with hardware accelerated transitions
* http://www.idangero.us/swiper/
*
* Copyright 2014-2017 Vladimir Kharlampidi
*
* Released under the MIT License
*
* Released on: September 13, 2017
* Released on: September 20, 2017
*/

import $ from 'dom7/src/$';
Expand Down Expand Up @@ -467,7 +467,7 @@ var updateSlides = function () {
.attr('data-swiper-column', column)
.attr('data-swiper-row', row);
}
if (slide.css('display') === 'none') continue;
if (slide.css('display') === 'none') continue; // eslint-disable-line
if (params.slidesPerView === 'auto') {
slideSize = swiper.isHorizontal() ? slide.outerWidth(true) : slide.outerHeight(true);
if (params.roundLengths) slideSize = Math.floor(slideSize);
Expand Down Expand Up @@ -1059,6 +1059,8 @@ var slideNext = function (speed = this.params.speed, runCallbacks = true, intern
if (params.loop) {
if (animating) return false;
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
Expand All @@ -1072,6 +1074,8 @@ var slidePrev = function (speed = this.params.speed, runCallbacks = true, intern
if (params.loop) {
if (animating) return false;
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
Expand Down Expand Up @@ -1237,7 +1241,7 @@ var appendSlide = function (slides) {
if (params.loop) {
swiper.loopDestroy();
}
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (let i = 0; i < slides.length; i += 1) {
if (slides[i]) $wrapperEl.append(slides[i]);
}
Expand All @@ -1260,7 +1264,7 @@ var prependSlide = function (slides) {
swiper.loopDestroy();
}
let newActiveIndex = activeIndex + 1;
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (let i = 0; i < slides.length; i += 1) {
if (slides[i]) $wrapperEl.prepend(slides[i]);
}
Expand Down Expand Up @@ -1288,7 +1292,7 @@ var removeSlide = function (slidesIndexes) {
let newActiveIndex = activeIndex;
let indexToRemove;

if (typeof slidesIndexes === 'object' && slidesIndexes.length) {
if (typeof slidesIndexes === 'object' && 'length' in slidesIndexes) {
for (let i = 0; i < slidesIndexes.length; i += 1) {
indexToRemove = slidesIndexes[i];
if (swiper.slides[indexToRemove]) swiper.slides.eq(indexToRemove).remove();
Expand Down Expand Up @@ -1349,8 +1353,8 @@ const Device = (function Device() {
phonegap: win.cordova || win.phonegap,
};

const windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/);
const android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
const windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/); // eslint-disable-line
const android = ua.match(/(Android);?[\s\/]+([\d.]+)?/); // eslint-disable-line
const ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
const ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
const iphone = !ipad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
Expand Down Expand Up @@ -3037,14 +3041,14 @@ const Mousewheel = {
if (params.forceToAxis) {
if (swiper.isHorizontal()) {
if (Math.abs(data.pixelX) > Math.abs(data.pixelY)) delta = data.pixelX * rtlFactor;
else return;
else return true;
} else if (Math.abs(data.pixelY) > Math.abs(data.pixelX)) delta = data.pixelY;
else return;
else return true;
} else {
delta = Math.abs(data.pixelX) > Math.abs(data.pixelY) ? -data.pixelX * rtlFactor : -data.pixelY;
}

if (delta === 0) return;
if (delta === 0) return true;

if (params.invert) delta = -delta;

Expand Down Expand Up @@ -3094,7 +3098,7 @@ const Mousewheel = {
if (swiper.params.autoplay && swiper.params.autoplayDisableOnInteraction) swiper.stopAutoplay();

// Return page scroll on edge positions
if (position === 0 || position === swiper.maxTranslate()) return;
if (position === 0 || position === swiper.maxTranslate()) return true;
}

if (e.preventDefault) e.preventDefault();
Expand Down Expand Up @@ -3700,6 +3704,9 @@ const Scrollbar = {
} else if (position > positionMax) {
position = positionMax;
}
if (swiper.rtl) {
position = positionMax - position;
}
position = -position / moveDivider;
swiper.updateProgress(position);
swiper.setTranslate(position);
Expand Down
31 changes: 19 additions & 12 deletions dist/js/swiper.module.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* Swiper 4.0.0-beta.3
* Swiper 4.0.0-beta.4
* Most modern mobile touch slider and framework with hardware accelerated transitions
* http://www.idangero.us/swiper/
*
* Copyright 2014-2017 Vladimir Kharlampidi
*
* Released under the MIT License
*
* Released on: September 13, 2017
* Released on: September 20, 2017
*/

import $ from 'dom7/src/$';
Expand Down Expand Up @@ -467,7 +467,7 @@ var updateSlides = function () {
.attr('data-swiper-column', column)
.attr('data-swiper-row', row);
}
if (slide.css('display') === 'none') continue;
if (slide.css('display') === 'none') continue; // eslint-disable-line
if (params.slidesPerView === 'auto') {
slideSize = swiper.isHorizontal() ? slide.outerWidth(true) : slide.outerHeight(true);
if (params.roundLengths) slideSize = Math.floor(slideSize);
Expand Down Expand Up @@ -1059,6 +1059,8 @@ var slideNext = function (speed = this.params.speed, runCallbacks = true, intern
if (params.loop) {
if (animating) return false;
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex + params.slidesPerGroup, speed, runCallbacks, internal);
Expand All @@ -1072,6 +1074,8 @@ var slidePrev = function (speed = this.params.speed, runCallbacks = true, intern
if (params.loop) {
if (animating) return false;
swiper.loopFix();
// eslint-disable-next-line
swiper._clientLeft = swiper.$wrapperEl[0].clientLeft;
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
}
return swiper.slideTo(swiper.activeIndex - 1, speed, runCallbacks, internal);
Expand Down Expand Up @@ -1237,7 +1241,7 @@ var appendSlide = function (slides) {
if (params.loop) {
swiper.loopDestroy();
}
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (let i = 0; i < slides.length; i += 1) {
if (slides[i]) $wrapperEl.append(slides[i]);
}
Expand All @@ -1260,7 +1264,7 @@ var prependSlide = function (slides) {
swiper.loopDestroy();
}
let newActiveIndex = activeIndex + 1;
if (typeof slides === 'object' && slides.length) {
if (typeof slides === 'object' && 'length' in slides) {
for (let i = 0; i < slides.length; i += 1) {
if (slides[i]) $wrapperEl.prepend(slides[i]);
}
Expand Down Expand Up @@ -1288,7 +1292,7 @@ var removeSlide = function (slidesIndexes) {
let newActiveIndex = activeIndex;
let indexToRemove;

if (typeof slidesIndexes === 'object' && slidesIndexes.length) {
if (typeof slidesIndexes === 'object' && 'length' in slidesIndexes) {
for (let i = 0; i < slidesIndexes.length; i += 1) {
indexToRemove = slidesIndexes[i];
if (swiper.slides[indexToRemove]) swiper.slides.eq(indexToRemove).remove();
Expand Down Expand Up @@ -1349,8 +1353,8 @@ const Device = (function Device() {
phonegap: win.cordova || win.phonegap,
};

const windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/);
const android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
const windows = ua.match(/(Windows Phone);?[\s\/]+([\d.]+)?/); // eslint-disable-line
const android = ua.match(/(Android);?[\s\/]+([\d.]+)?/); // eslint-disable-line
const ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
const ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
const iphone = !ipad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
Expand Down Expand Up @@ -3037,14 +3041,14 @@ const Mousewheel = {
if (params.forceToAxis) {
if (swiper.isHorizontal()) {
if (Math.abs(data.pixelX) > Math.abs(data.pixelY)) delta = data.pixelX * rtlFactor;
else return;
else return true;
} else if (Math.abs(data.pixelY) > Math.abs(data.pixelX)) delta = data.pixelY;
else return;
else return true;
} else {
delta = Math.abs(data.pixelX) > Math.abs(data.pixelY) ? -data.pixelX * rtlFactor : -data.pixelY;
}

if (delta === 0) return;
if (delta === 0) return true;

if (params.invert) delta = -delta;

Expand Down Expand Up @@ -3094,7 +3098,7 @@ const Mousewheel = {
if (swiper.params.autoplay && swiper.params.autoplayDisableOnInteraction) swiper.stopAutoplay();

// Return page scroll on edge positions
if (position === 0 || position === swiper.maxTranslate()) return;
if (position === 0 || position === swiper.maxTranslate()) return true;
}

if (e.preventDefault) e.preventDefault();
Expand Down Expand Up @@ -3700,6 +3704,9 @@ const Scrollbar = {
} else if (position > positionMax) {
position = positionMax;
}
if (swiper.rtl) {
position = positionMax - position;
}
position = -position / moveDivider;
swiper.updateProgress(position);
swiper.setTranslate(position);
Expand Down
Loading

0 comments on commit 07a2b5d

Please sign in to comment.