From 1e7efe70e11937142cc1801f763081b46bacced4 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 26 Sep 2011 08:45:22 +0000 Subject: [PATCH] fix scroll wheel regression. fixes #430 --- lib/ace/mouse/default_handlers.js | 8 ++++---- lib/ace/mouse/mouse_handler.js | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index 138e2b7a..4037b2fe 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -60,7 +60,7 @@ function DefaultHandlers(editor) { editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this)); editor.setDefaultHandler("tripleclick", this.onTripleClick.bind(this)); editor.setDefaultHandler("quadclick", this.onQuadClick.bind(this)); - editor.setDefaultHandler("scroll", this.onScroll.bind(this)); + editor.setDefaultHandler("mousewheel", this.onScroll.bind(this)); } (function() { @@ -285,9 +285,9 @@ function DefaultHandlers(editor) { this.onScroll = function(ev) { var editor = this.editor; - editor.renderer.scrollBy(e.wheelX * ev.speed, e.wheelY * speed); - if (editor.renderer.isScrollableBy(e.wheelX, e.wheelY)) - return event.preventDefault(e); + editor.renderer.scrollBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed); + if (editor.renderer.isScrollableBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed)) + return ev.preventDefault(); }; }).call(DefaultHandlers.prototype); diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index a76116a1..2b09b832 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -103,8 +103,10 @@ var MouseHandler = function(editor) { this.onMouseWheel = function(e) { var mouseEvent = new MouseEvent(e, this.editor); mouseEvent.speed = this.$scrollSpeed * 2; + mouseEvent.wheelX = e.wheelX; + mouseEvent.wheelY = e.wheelY; - this.editor._dispatchEvent("quadclick", mouseEvent); + this.editor._dispatchEvent("mousewheel", mouseEvent); }; }).call(MouseHandler.prototype);