From 0a43cda0a8fb2bc6f43f1b1b24600123b1923c75 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 9 Mar 2015 16:32:17 +0000 Subject: [PATCH] Fix sidebox scrolling conflicts with selectbox scrolling in IE --- phpgwapi/js/framework/fw_ui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpgwapi/js/framework/fw_ui.js b/phpgwapi/js/framework/fw_ui.js index bc3d88e68e..0895902144 100644 --- a/phpgwapi/js/framework/fw_ui.js +++ b/phpgwapi/js/framework/fw_ui.js @@ -848,15 +848,17 @@ function egw_fw_ui_scrollarea(_contDiv) //Mousewheel handler var self = this; - $j(this.scrollDiv).mousewheel(function(e, delta) { + $j(this.scrollDiv).on('mousewheel',function(e, delta) { // Do not scrolldown/up when we are on selectbox items // seems Firefox does not prevent the mousewheel event over // selectbox items with scrollbars - if (delta && e.target.tagName != "OPTION") + if (delta && e.target.tagName != "OPTION" && e.target.tagName != "SELECT") { + e.stopPropagation(); self.scrollDelta(- delta * 30); if (self.contHeight != this.scrollHeight) self.update(); } + }); //Create a container which contains the up/down buttons and the scrollDiv