From cb686636cd34da6880036f7d72c8de18ed70d9b2 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sun, 16 Mar 2014 21:24:52 -0500 Subject: [PATCH] fix(scrollView): don't show bars if not scrolling. Fixes #805 --- js/views/scrollView.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/js/views/scrollView.js b/js/views/scrollView.js index 9aa058658e..47504b16c0 100644 --- a/js/views/scrollView.js +++ b/js/views/scrollView.js @@ -743,9 +743,6 @@ ionic.views.Scroll = ionic.views.View.inherit({ __resizeScrollbars: function() { var self = this; - // Bring the scrollbars in to show the content change - self.__fadeScrollbars('in'); - // Update horiz bar if(self.__indicatorX) { var width = Math.max(Math.round(self.__clientWidth * self.__clientWidth / (self.__contentWidth)), 20); @@ -1360,8 +1357,6 @@ ionic.views.Scroll = ionic.views.View.inherit({ var self = this; - self.__fadeScrollbars('in'); - // Reset interruptedAnimation flag self.__interruptedAnimation = true; @@ -1604,6 +1599,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ self.__isDragging = (self.__enableScrollX || self.__enableScrollY) && (distanceX >= minimumTrackingForDrag || distanceY >= minimumTrackingForDrag); if (self.__isDragging) { self.__interruptedAnimation = false; + self.__fadeScrollbars('in'); } }