cartodb4/perfect-scrollbar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small style fixes for preventDefault functions.

Browse Source
This commit is contained in:
Hyunje Alex Jun
2014-12-02 11:24:36 +00:00
parent 931be25635
commit 7ce708216d
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/perfect-scrollbar.js
+9 -12
View File
@@ -313,8 +313,7 @@
currentPageY = null; currentPageY = null;
} }
// check if the default scrolling should be prevented. function shouldPreventWheel(deltaX, deltaY) {
function shouldPreventDefault(deltaX, deltaY) {
var scrollTop = $this.scrollTop(); var scrollTop = $this.scrollTop();
if (deltaX === 0) { if (deltaX === 0) {
if (!scrollbarYActive) { if (!scrollbarYActive) {
@@ -337,13 +336,11 @@
return true; return true;
} }
// check if default swipe should be prevented function shouldPreventSwipe(deltaX, deltaY) {
function shouldPreventDefaultSwipe(deltaX, deltaY) { var scrollTop = $this.scrollTop();
var var scrollLeft = $this.scrollLeft();
scrollTop = $this.scrollTop(), var magnitudeX = Math.abs(deltaX);
scrollLeft = $this.scrollLeft(), var magnitudeY = Math.abs(deltaY);
magnitudeX = Math.abs(deltaX),
magnitudeY = Math.abs(deltaY);
if (magnitudeY > magnitudeX) { if (magnitudeY > magnitudeX) {
// user is perhaps trying to swipe up/down the page // user is perhaps trying to swipe up/down the page
@@ -433,7 +430,7 @@
updateGeometry(); updateGeometry();
shouldPrevent = (shouldPrevent || shouldPreventDefault(deltaX, deltaY)); shouldPrevent = (shouldPrevent || shouldPreventWheel(deltaX, deltaY));
if (shouldPrevent) { if (shouldPrevent) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@@ -519,7 +516,7 @@
$this.scrollTop($this.scrollTop() - deltaY); $this.scrollTop($this.scrollTop() - deltaY);
$this.scrollLeft($this.scrollLeft() + deltaX); $this.scrollLeft($this.scrollLeft() + deltaX);
shouldPrevent = shouldPreventDefault(deltaX, deltaY); shouldPrevent = shouldPreventWheel(deltaX, deltaY);
if (shouldPrevent) { if (shouldPrevent) {
e.preventDefault(); e.preventDefault();
} }
@@ -741,7 +738,7 @@
startTime = currentTime; startTime = currentTime;
} }
if (shouldPreventDefaultSwipe(differenceX, differenceY)) { if (shouldPreventSwipe(differenceX, differenceY)) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }