From 9f85d2bdb3347b7d9147d8093c791789343f40eb Mon Sep 17 00:00:00 2001 From: daboe01 Date: Thu, 17 Jan 2013 20:43:37 +0100 Subject: [PATCH 1/2] fix for scrollwheel in FF>3 (issue #1244) --- AppKit/Platform/DOM/CPPlatformWindow+DOM.j | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j index dff0fb70f..b7a5f67da 100644 --- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j +++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j @@ -426,6 +426,7 @@ var resizeTimer = nil; theDocument.addEventListener("touchcancel", touchEventCallback, NO); _DOMWindow.addEventListener("DOMMouseScroll", scrollEventCallback, NO); + _DOMWindow.addEventListener("wheel", scrollEventCallback, NO); _DOMWindow.addEventListener("mousewheel", scrollEventCallback, NO); _DOMWindow.addEventListener("resize", resizeEventCallback, NO); @@ -456,6 +457,7 @@ var resizeTimer = nil; //FIXME: does firefox really need a different value? _DOMWindow.removeEventListener("DOMMouseScroll", scrollEventCallback, NO); + _DOMWindow.removeEventListener("wheel", scrollEventCallback, NO); _DOMWindow.removeEventListener("mousewheel", scrollEventCallback, NO); //_DOMWindow.removeEventListener("beforeunload", this, NO); @@ -1040,7 +1042,7 @@ var resizeTimer = nil; { // Find the scroll delta var deltaX = _DOMScrollingElement.scrollLeft - 150, - deltaY = _DOMScrollingElement.scrollTop - 150; + deltaY = (_DOMScrollingElement.scrollTop - 150) || (aDOMEvent.deltaY===undefined?0: aDOMEvent.deltaY); // If we scroll super with momentum, // there are so many events going off that From 1f19e028d58d22e5ce8a19068f94acf50b0122ea Mon Sep 17 00:00:00 2001 From: daboe01 Date: Wed, 13 Feb 2013 19:07:06 +0100 Subject: [PATCH 2/2] CPWebView scrollwheel fix --- AppKit/CPWebView.j | 1 + 1 file changed, 1 insertion(+) diff --git a/AppKit/CPWebView.j b/AppKit/CPWebView.j index 57717d744..af514ff75 100644 --- a/AppKit/CPWebView.j +++ b/AppKit/CPWebView.j @@ -258,6 +258,7 @@ CPWebViewAppKitScrollMaxPollCount = 3; }; win.addEventListener("DOMMouseScroll", scrollEventHandler, false); + win.addEventListener("wheel", scrollEventHandler, false); } }