Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtesaak committed Jul 10, 2018
1 parent 958a3df commit 3c906cb
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 13 deletions.
9 changes: 6 additions & 3 deletions dist/perfect-scrollbar.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,10 @@ var touch = function(i) {

var element = i.element;

function shouldPrevent(deltaX, deltaY) {
function shouldPrevent(deltaX, deltaY, e) {
if (!e.cancelable) {
return false;
}
var scrollTop = Math.floor(element.scrollTop);
var scrollLeft = element.scrollLeft;
var magnitudeX = Math.abs(deltaX);
Expand Down Expand Up @@ -1041,8 +1044,8 @@ var touch = function(i) {
speed.y = differenceY / timeGap;
startTime = currentTime;
}
console.log(e);
if (shouldPrevent(differenceX, differenceY)) {

if (shouldPrevent(differenceX, differenceY, e)) {
e.preventDefault();
}
}
Expand Down
9 changes: 6 additions & 3 deletions dist/perfect-scrollbar.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,10 @@ var touch = function(i) {

var element = i.element;

function shouldPrevent(deltaX, deltaY) {
function shouldPrevent(deltaX, deltaY, e) {
if (!e.cancelable) {
return false;
}
var scrollTop = Math.floor(element.scrollTop);
var scrollLeft = element.scrollLeft;
var magnitudeX = Math.abs(deltaX);
Expand Down Expand Up @@ -1039,8 +1042,8 @@ var touch = function(i) {
speed.y = differenceY / timeGap;
startTime = currentTime;
}
console.log(e);
if (shouldPrevent(differenceX, differenceY)) {

if (shouldPrevent(differenceX, differenceY, e)) {
e.preventDefault();
}
}
Expand Down
9 changes: 6 additions & 3 deletions dist/perfect-scrollbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,10 @@ var touch = function(i) {

var element = i.element;

function shouldPrevent(deltaX, deltaY) {
function shouldPrevent(deltaX, deltaY, e) {
if (!e.cancelable) {
return false;
}
var scrollTop = Math.floor(element.scrollTop);
var scrollLeft = element.scrollLeft;
var magnitudeX = Math.abs(deltaX);
Expand Down Expand Up @@ -1045,8 +1048,8 @@ var touch = function(i) {
speed.y = differenceY / timeGap;
startTime = currentTime;
}
console.log(e);
if (shouldPrevent(differenceX, differenceY)) {

if (shouldPrevent(differenceX, differenceY, e)) {
e.preventDefault();
}
}
Expand Down
Loading

0 comments on commit 3c906cb

Please sign in to comment.