diff --git a/js/views/scrollView.js b/js/views/scrollView.js index 9632fd53dde..74b85f2dceb 100644 --- a/js/views/scrollView.js +++ b/js/views/scrollView.js @@ -736,7 +736,8 @@ ionic.views.Scroll = ionic.views.View.inherit({ }; self.touchMove = function(e) { - if (!self.__isDown || + if (ionic.slide.isSliding || + !self.__isDown || (!self.__isDown && e.defaultPrevented) || (e.target.tagName === 'TEXTAREA' && e.target.parentElement.querySelector(':focus')) ) { return; diff --git a/js/views/sliderView.js b/js/views/sliderView.js index c7ce9fe8035..e59eb5af8c6 100644 --- a/js/views/sliderView.js +++ b/js/views/sliderView.js @@ -334,6 +334,8 @@ ionic.views.Slider = ionic.views.View.inherit({ // prevent native scrolling event.preventDefault(); + ionic.slide.isSliding = true; + // stop slideshow stop(); @@ -366,6 +368,8 @@ ionic.views.Slider = ionic.views.View.inherit({ }, end: function(event) { + ionic.slide.isSliding = false; + // measure duration var duration = +new Date() - start.time; @@ -613,4 +617,8 @@ ionic.views.Slider = ionic.views.View.inherit({ } }); +ionic.slide = { + isSliding: false +}; + })(ionic);