@@ -610,15 +610,15 @@ ionic.views.Scroll = ionic.views.View.inherit({
610
610
self . scrollTo ( 0 , elementScrollTop + elementHeight - ( deviceHeight * 0.5 ) , true ) ;
611
611
}
612
612
613
- //Only the first scrollView parent of the element that broadcasted this event
613
+ //Only the first scrollView parent of the element that broadcasted this event
614
614
//(the active element that needs to be shown) should receive this event
615
615
e . stopPropagation ( ) ;
616
616
} ) ;
617
617
618
618
if ( 'ontouchstart' in window ) {
619
619
620
620
container . addEventListener ( "touchstart" , function ( e ) {
621
- if ( e . __scroller ) {
621
+ if ( e . defaultPrevented ) {
622
622
return ;
623
623
}
624
624
// Don't react if initial down happens on a form element
@@ -628,8 +628,6 @@ ionic.views.Scroll = ionic.views.View.inherit({
628
628
629
629
self . doTouchStart ( e . touches , e . timeStamp ) ;
630
630
e . preventDefault ( ) ;
631
- //We don't want to stop propagation, other things might want to know about the touchstart
632
- e . __scroller = true ;
633
631
} , false ) ;
634
632
635
633
document . addEventListener ( "touchmove" , function ( e ) {
@@ -648,7 +646,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
648
646
var mousedown = false ;
649
647
650
648
container . addEventListener ( "mousedown" , function ( e ) {
651
- if ( e . __scroller ) {
649
+ if ( e . defaultPrevented ) {
652
650
return ;
653
651
}
654
652
// Don't react if initial down happens on a form element
@@ -661,8 +659,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
661
659
pageY : e . pageY
662
660
} ] , e . timeStamp ) ;
663
661
664
- //We don't want to stop propagation, other things might want to know about the touchstart
665
- e . __scroller = true ;
662
+ e . preventDefault ( ) ;
666
663
mousedown = true ;
667
664
} , false ) ;
668
665
0 commit comments