Skip to content

Commit 25e173a

Browse files
author
Wesley Cho
committed
bug(scroll)
Fix IE10 scroll issue. This addresses #2728
1 parent b6c7f3f commit 25e173a

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

js/views/scrollView.js

+19-18
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,24 @@ ionic.views.Scroll = ionic.views.View.inherit({
796796
}
797797
};
798798

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+
799817
if ('ontouchstart' in window) {
800818
// Touch Events
801819
container.addEventListener("touchstart", self.touchStart, false);
@@ -819,6 +837,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
819837
document.addEventListener("MSPointerMove", self.touchMove, false);
820838
document.addEventListener("MSPointerUp", self.touchEnd, false);
821839
document.addEventListener("MSPointerCancel", self.touchEnd, false);
840+
document.addEventListener("wheel", self.mouseWheel, false);
822841

823842
} else {
824843
// Mouse Events
@@ -862,24 +881,6 @@ ionic.views.Scroll = ionic.views.View.inherit({
862881
mousedown = false;
863882
};
864883

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-
883884
container.addEventListener("mousedown", self.mouseDown, false);
884885
if(self.options.preventDefault) container.addEventListener("mousemove", self.mouseMoveBubble, false);
885886
document.addEventListener("mousemove", self.mouseMove, false);

0 commit comments

Comments
 (0)