Fix sidebox scrolling conflicts with selectbox scrolling in IE

This commit is contained in:
Hadi Nategh 2015-03-09 16:30:19 +00:00
parent 7954f1c2ca
commit 5e681e3156

View File

@ -848,15 +848,17 @@ function egw_fw_ui_scrollarea(_contDiv)
//Mousewheel handler //Mousewheel handler
var self = this; 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 // Do not scrolldown/up when we are on selectbox items
// seems Firefox does not prevent the mousewheel event over // seems Firefox does not prevent the mousewheel event over
// selectbox items with scrollbars // 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); self.scrollDelta(- delta * 30);
if (self.contHeight != this.scrollHeight) self.update(); if (self.contHeight != this.scrollHeight) self.update();
} }
}); });
//Create a container which contains the up/down buttons and the scrollDiv //Create a container which contains the up/down buttons and the scrollDiv