Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
lipten authored and lipten committed Jan 2, 2018
1 parent 4f2338d commit d5b1468
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slidePage",
"version": "3.1.0",
"version": "3.1.1",
"description": "slidePage.js is a simple and universal to use libary to create fullscreen scrolling websites",
"main": "dist/slidePage.min.js",
"directories": {
Expand Down
21 changes: 11 additions & 10 deletions slidePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
element.style.display = 'none';
})
methods.runAnimation.call(this, index);
this.items.forEach(function (item, i) {
for (var i = 0, item; item = this.items[i]; i++) {
if (i === index) {
item.style.transform = 'translate3d(0, 0, 0)';
} else {
Expand All @@ -178,11 +178,13 @@
item.style.transform = 'translate3d(0, 100%, 0)';
}
}
var timer = setTimeout(function () {
item.classList.add('transition');
clearTimeout(timer);
});
})
(function(item) {
var timer = setTimeout(function () {
item.classList.add('transition');
clearTimeout(timer);
});
})(item)
}
}
},

Expand Down Expand Up @@ -216,9 +218,8 @@
page: pageParams || 1,
slidePages: '.slide-page',
slideContainer: '.slide-container',
after: function () { },
before: function () { },
speed: false,
after: null,
before: null,
refresh: false,
useWheel: true,
useSwipe: true,
Expand Down Expand Up @@ -347,7 +348,7 @@
var newItems = utils.isDOM(pages) ? pages : document.querySelectorAll(this.opt.slidePages);
for (var i = 0, len = newItems.length; i < len; i++) {
// 判断当前活动的page是否还存在则保持当前屏
if (utils.isEqualNode(newItems[i], this.items[this.page - 1])) {
if (this.items[this.page - 1] && utils.isEqualNode(this.items[this.page - 1], newItems[i])) {
this.page = i + 1;
break;
}
Expand Down

0 comments on commit d5b1468

Please sign in to comment.