From bbf3d4db9fab5098da57a84c810660748515d383 Mon Sep 17 00:00:00 2001 From: DanielApt Date: Tue, 10 Nov 2015 22:41:56 +0000 Subject: [PATCH] Remove usages of scrollbarYTop and scrollbarXLeft #390 --- src/js/plugin/handler/drag-scrollbar.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/js/plugin/handler/drag-scrollbar.js b/src/js/plugin/handler/drag-scrollbar.js index 5ebe06f..13d7eff 100644 --- a/src/js/plugin/handler/drag-scrollbar.js +++ b/src/js/plugin/handler/drag-scrollbar.js @@ -15,11 +15,7 @@ function bindMouseScrollXHandler(element, i) { function updateScrollLeft(deltaX) { var newLeft = currentLeft + (deltaX * i.railXRatio); - var scrollbarXLeft = i.scrollbarXRail.getBoundingClientRect().left; - if (scrollbarXLeft < 0) { - scrollbarXLeft = 0; - } - var maxLeft = scrollbarXLeft + (i.railXRatio * (i.railXWidth - i.scrollbarXWidth)); + var maxLeft = Math.max(0, i.scrollbarXRail.getBoundingClientRect().left) + (i.railXRatio * (i.railXWidth - i.scrollbarXWidth)); if (newLeft < 0) { i.scrollbarXLeft = 0; @@ -64,12 +60,7 @@ function bindMouseScrollYHandler(element, i) { function updateScrollTop(deltaY) { var newTop = currentTop + (deltaY * i.railYRatio); - var scrollbarYTop = i.scrollbarYRail.getBoundingClientRect().top; - - if(scrollbarYTop < 0) { - scrollbarYTop = 0; - } - var maxTop = scrollbarYTop + (i.railYRatio * (i.railYHeight - i.scrollbarYHeight)); + var maxTop = Math.max(0, i.scrollbarYRail.getBoundingClientRect().top) + (i.railYRatio * (i.railYHeight - i.scrollbarYHeight)); if (newTop < 0) { i.scrollbarYTop = 0;