@@ -796,6 +796,24 @@ ionic.views.Scroll = ionic.views.View.inherit({
796
796
}
797
797
} ;
798
798
799
+ self . mouseWheel = ionic . animationFrameThrottle ( function ( e ) {
800
+ var scrollParent = ionic . DomUtil . getParentOrSelfWithClass ( e . target , 'ionic-scroll' ) ;
801
+ if ( scrollParent === self . __container ) {
802
+
803
+ self . hintResize ( ) ;
804
+ self . scrollBy (
805
+ ( e . wheelDeltaX || e . deltaX || 0 ) / self . options . wheelDampen ,
806
+ ( - e . wheelDeltaY || e . deltaY || 0 ) / self . options . wheelDampen
807
+ ) ;
808
+
809
+ self . __fadeScrollbars ( 'in' ) ;
810
+ clearTimeout ( self . __wheelHideBarTimeout ) ;
811
+ self . __wheelHideBarTimeout = setTimeout ( function ( ) {
812
+ self . __fadeScrollbars ( 'out' ) ;
813
+ } , 100 ) ;
814
+ }
815
+ } ) ;
816
+
799
817
if ( 'ontouchstart' in window ) {
800
818
// Touch Events
801
819
container . addEventListener ( "touchstart" , self . touchStart , false ) ;
@@ -819,6 +837,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
819
837
document . addEventListener ( "MSPointerMove" , self . touchMove , false ) ;
820
838
document . addEventListener ( "MSPointerUp" , self . touchEnd , false ) ;
821
839
document . addEventListener ( "MSPointerCancel" , self . touchEnd , false ) ;
840
+ document . addEventListener ( "wheel" , self . mouseWheel , false ) ;
822
841
823
842
} else {
824
843
// Mouse Events
@@ -862,24 +881,6 @@ ionic.views.Scroll = ionic.views.View.inherit({
862
881
mousedown = false ;
863
882
} ;
864
883
865
- self . mouseWheel = ionic . animationFrameThrottle ( function ( e ) {
866
- var scrollParent = ionic . DomUtil . getParentOrSelfWithClass ( e . target , 'ionic-scroll' ) ;
867
- if ( scrollParent === self . __container ) {
868
-
869
- self . hintResize ( ) ;
870
- self . scrollBy (
871
- ( e . wheelDeltaX || e . deltaX || 0 ) / self . options . wheelDampen ,
872
- ( - e . wheelDeltaY || e . deltaY || 0 ) / self . options . wheelDampen
873
- ) ;
874
-
875
- self . __fadeScrollbars ( 'in' ) ;
876
- clearTimeout ( self . __wheelHideBarTimeout ) ;
877
- self . __wheelHideBarTimeout = setTimeout ( function ( ) {
878
- self . __fadeScrollbars ( 'out' ) ;
879
- } , 100 ) ;
880
- }
881
- } ) ;
882
-
883
884
container . addEventListener ( "mousedown" , self . mouseDown , false ) ;
884
885
if ( self . options . preventDefault ) container . addEventListener ( "mousemove" , self . mouseMoveBubble , false ) ;
885
886
document . addEventListener ( "mousemove" , self . mouseMove , false ) ;
0 commit comments