Skip to content

Commit a7d93b8

Browse files
committed
Re-fixes mousewheel scrolling in FF
Previous "improvement" from 2f6aabf was incomplete in FF (at least)--my bad!
1 parent dcd0345 commit a7d93b8

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

js/jquery.fn.gantt.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -808,9 +808,7 @@
808808
.append($('<a class="nav-slider-button" />')
809809
)
810810
.mousedown(function (e) {
811-
if (e.preventDefault) {
812-
e.preventDefault();
813-
}
811+
e.preventDefault();
814812
element.scrollNavigation.scrollerMouseDown = true;
815813
core.sliderScroll(element, e);
816814
})
@@ -1300,18 +1298,22 @@
13001298

13011299
// Move chart via mousewheel
13021300
wheelScroll: function (element, e) {
1303-
var delta = - 50 * ('detail' in e ? e.detail : - 1/120 * e.originalEvent.wheelDelta);
1301+
e.preventDefault(); // e is a jQuery Event
13041302

1305-
core.scrollPanel(element, delta);
1303+
// attempts to normalize scroll wheel velocity
1304+
var delta = ( 'detail' in e ? e.detail :
1305+
'wheelDelta' in e.originalEvent ? - 1/120 * e.originalEvent.wheelDelta :
1306+
e.originalEvent.deltaY ? e.originalEvent.deltaY / Math.abs(e.originalEvent.deltaY) :
1307+
e.originalEvent.detail );
1308+
1309+
// simpler normalization, ignoring per-device/browser/platform acceleration & semantic variations
1310+
//var delta = e.detail || - (e = e.originalEvent).wheelData || e.deltaY /* || e.deltaX */ || e.detail;
1311+
//delta = ( delta / Math.abs(delta) ) || 0;
1312+
1313+
core.scrollPanel(element, -50 * delta);
13061314

13071315
clearTimeout(element.scrollNavigation.repositionDelay);
13081316
element.scrollNavigation.repositionDelay = setTimeout(core.repositionLabel, 50, element);
1309-
1310-
if (e.preventDefault) {
1311-
e.preventDefault();
1312-
} else {
1313-
return false;
1314-
}
13151317
},
13161318

13171319
// Move chart via slider control

0 commit comments

Comments
 (0)