|
19 | 19 | }
|
20 | 20 | }(function ($) {
|
21 | 21 |
|
22 |
| - var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll']; |
23 |
| - var toBind = 'onwheel' in document || document.documentMode >= 9 ? ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll']; |
24 |
| - var slice = Array.prototype.slice; |
25 |
| - var lowestDelta, lowestDeltaXY; |
| 22 | + var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'], |
| 23 | + toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ? |
| 24 | + ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'], |
| 25 | + slice = Array.prototype.slice, |
| 26 | + lowestDelta; |
26 | 27 |
|
27 | 28 | if ( $.event.fixHooks ) {
|
28 | 29 | for ( var i = toFix.length; i; ) {
|
|
69 | 70 | delta = 0,
|
70 | 71 | deltaX = 0,
|
71 | 72 | deltaY = 0,
|
72 |
| - absDelta = 0, |
73 |
| - absDeltaXY = 0, |
74 |
| - fn; |
| 73 | + absDelta = 0; |
75 | 74 | event = $.event.fix(orgEvent);
|
76 | 75 | event.type = 'mousewheel';
|
77 | 76 |
|
|
103 | 102 | // No change actually happened, no reason to go any further
|
104 | 103 | if ( deltaY === 0 && deltaX === 0 ) { return; }
|
105 | 104 |
|
106 |
| - // Look for lowest delta to normalize the delta values |
107 |
| - absDelta = Math.abs(delta); |
108 |
| - if ( !lowestDelta || absDelta < lowestDelta ) { lowestDelta = absDelta; } |
109 |
| - absDeltaXY = Math.max(Math.abs(deltaY), Math.abs(deltaX)); |
110 |
| - if ( !lowestDeltaXY || absDeltaXY < lowestDeltaXY ) { lowestDeltaXY = absDeltaXY; } |
111 |
| - |
112 |
| - // Get a whole value for the deltas |
113 |
| - fn = delta > 0 ? 'floor' : 'ceil'; |
114 |
| - delta = Math[fn](delta / lowestDelta); |
115 |
| - deltaX = Math[fn](deltaX / lowestDeltaXY); |
116 |
| - deltaY = Math[fn](deltaY / lowestDeltaXY); |
| 105 | + // Store lowest absolute delta to normalize the delta values |
| 106 | + absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) ); |
| 107 | + if ( !lowestDelta || absDelta < lowestDelta ) { |
| 108 | + lowestDelta = absDelta; |
| 109 | + } |
| 110 | + |
| 111 | + // Get a whole, normalized value for the deltas |
| 112 | + delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta); |
| 113 | + deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta); |
| 114 | + deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta); |
117 | 115 |
|
118 | 116 | // Add event and delta to the front of the arguments
|
119 | 117 | args.unshift(event, delta, deltaX, deltaY);
|
|
0 commit comments