Merged in feature/280-dev-dev01 (pull request #21)
auto-patch 280-dev-dev01-2024-01-19T16_41_58 * auto-patch 280-dev-dev01-2024-01-19T16_41_58
This commit is contained in:
@@ -720,12 +720,16 @@
|
||||
});
|
||||
}
|
||||
} else { // FADE:
|
||||
// if (!touch) calls slider.wrapup() on fade animation end; if (touch) calls slider.wrapup() immediately
|
||||
if (!touch) {
|
||||
slider.slides.eq(slider.currentSlide).css({"zIndex": 1}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
|
||||
slider.slides.eq(target).css({"zIndex": 2}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
|
||||
} else {
|
||||
slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
|
||||
slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
|
||||
slider.slides.eq(slider.currentSlide).off("transitionend");
|
||||
slider.slides.eq(target).off("transitionend").on("transitionend", slider.wrapup);
|
||||
}
|
||||
|
||||
slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
|
||||
slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
|
||||
|
||||
if (touch) {
|
||||
slider.wrapup(dimension);
|
||||
}
|
||||
}
|
||||
@@ -896,12 +900,15 @@
|
||||
}
|
||||
if (type === "init") {
|
||||
if (!touch) {
|
||||
//slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
|
||||
// Every "opacity" change before outerWidth() does NOT get animated; every "opacity" change after outerWidth() becomes a fadeIn
|
||||
if (slider.vars.fadeFirstSlide == false) {
|
||||
slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).css({"opacity": 1});
|
||||
slider.slides.outerWidth();
|
||||
} else {
|
||||
slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).animate({"opacity": 1},slider.vars.animationSpeed,slider.vars.easing);
|
||||
slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).outerWidth();
|
||||
slider.slides.eq(slider.currentSlide).css({"zIndex": 2}).css({"opacity": 1});
|
||||
}
|
||||
slider.slides.css({ "transition": "opacity " + slider.vars.animationSpeed / 1000 + "s " + easing });
|
||||
} else {
|
||||
slider.slides.css({ "opacity": 0, "display": "block", "transition": "opacity " + slider.vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user