This commit is contained in:
Bellord
2026-09-05 07:25:42 +03:00
parent 5f8bc945f8
commit 4cfe79a842
2 changed files with 6 additions and 27 deletions
+5 -19
View File
@@ -1,7 +1,6 @@
/** /**
* bxSlider v4.2.1d * bxSlider v4.2.1d
* Copyright 2013-2017 Steven Wanderski * Copyright 2013-2017 Steven Wanderski
* fix https://github.com/stevenwanderski/bxslider-4/issues/1240#issuecomment-482294169
* Written while drinking Belgian ales and listening to jazz * Written while drinking Belgian ales and listening to jazz
* Licensed under MIT (http://opensource.org/licenses/MIT) * Licensed under MIT (http://opensource.org/licenses/MIT)
*/ */
@@ -296,7 +295,7 @@
$(this).one('load error', function() { $(this).one('load error', function() {
if (++count === total) { callback(); } if (++count === total) { callback(); }
}).each(function() { }).each(function() {
if (this.complete || this.src == '') { $(this).trigger('load'); } if (this.complete || this.naturalWidth || this.src == '') { $(this).trigger('load'); }
}); });
}); });
}; };
@@ -1107,7 +1106,7 @@
if (e.type !== 'touchstart' && e.button !== 0) { if (e.type !== 'touchstart' && e.button !== 0) {
return; return;
} }
//e.preventDefault();
//disable slider controls while user is interacting with slides to avoid slider freeze that happens on touch devices when a slide swipe happens immediately after interacting with slider controls //disable slider controls while user is interacting with slides to avoid slider freeze that happens on touch devices when a slide swipe happens immediately after interacting with slider controls
slider.controls.el.addClass('disabled'); slider.controls.el.addClass('disabled');
@@ -1128,9 +1127,9 @@
slider.touch.start.x = touchPoints[0].pageX; slider.touch.start.x = touchPoints[0].pageX;
slider.touch.start.y = touchPoints[0].pageY; slider.touch.start.y = touchPoints[0].pageY;
slider.hasPointerCapture = false;
if (slider.viewport.get(0).setPointerCapture) { if (slider.viewport.get(0).setPointerCapture) {
slider.pointerId = orig.pointerId; slider.pointerId = orig.pointerId;
slider.viewport.get(0).setPointerCapture(slider.pointerId);
} }
// store original event data for click fixation // store original event data for click fixation
slider.originalClickTarget = orig.originalTarget || orig.target; slider.originalClickTarget = orig.originalTarget || orig.target;
@@ -1164,9 +1163,8 @@
slider.viewport.off('MSPointerCancel pointercancel', onPointerCancel); slider.viewport.off('MSPointerCancel pointercancel', onPointerCancel);
slider.viewport.off('touchmove MSPointerMove pointermove', onTouchMove); slider.viewport.off('touchmove MSPointerMove pointermove', onTouchMove);
slider.viewport.off('touchend MSPointerUp pointerup', onTouchEnd); slider.viewport.off('touchend MSPointerUp pointerup', onTouchEnd);
if (slider.viewport.get(0).releasePointerCapture && slider.hasPointerCapture) { if (slider.viewport.get(0).releasePointerCapture) {
slider.viewport.get(0).releasePointerCapture(slider.pointerId); slider.viewport.get(0).releasePointerCapture(slider.pointerId);
slider.hasPointerCapture = false;
} }
}; };
@@ -1187,15 +1185,6 @@
// this is swipe // this is swipe
slider.hasMove = true; slider.hasMove = true;
var hasSwiped = false;
if ((xMovement > 5) || (yMovement > 5)) {
hasSwiped = true;
}
if (slider.viewport.get(0).setPointerCapture && !slider.hasPointerCapture && hasSwiped && (slider.pointerId === 1)) {
slider.viewport.get(0).setPointerCapture(slider.pointerId);
slider.hasPointerCapture = true;
}
// x axis swipe // x axis swipe
if ((xMovement * 3) > yMovement && slider.settings.preventDefaultSwipeX) { if ((xMovement * 3) > yMovement && slider.settings.preventDefaultSwipeX) {
e.preventDefault(); e.preventDefault();
@@ -1228,6 +1217,7 @@
* - DOM event object * - DOM event object
*/ */
var onTouchEnd = function(e) { var onTouchEnd = function(e) {
slider.touch.axis = undefined;
e.preventDefault(); e.preventDefault();
slider.viewport.off('touchmove MSPointerMove pointermove', onTouchMove); slider.viewport.off('touchmove MSPointerMove pointermove', onTouchMove);
//enable slider controls as soon as user stops interacing with slides //enable slider controls as soon as user stops interacing with slides
@@ -1292,10 +1282,6 @@
buttons: slider.originalClickButtons buttons: slider.originalClickButtons
}); });
} }
if (slider.viewport.get(0).releasePointerCapture && slider.hasPointerCapture) {
slider.viewport.get(0).releasePointerCapture(slider.pointerId);
slider.hasPointerCapture = false;
}
}; };
/** /**
File diff suppressed because one or more lines are too long