Skip to content

Commit 919d918

Browse files
jzaeffererjzaefferer
committed
External: Update mousewheel plugin, copy only main file
1 parent a69ccd6 commit 919d918

File tree

3 files changed

+154
-35
lines changed

3 files changed

+154
-35
lines changed

‎Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ grunt.initConfig({
228228
},
229229
mousewheel: {
230230
files: {
231-
"external": "jquery-mousewheel/*.js"
231+
"external": "jquery-mousewheel/jquery.mousewheel.js"
232232
}
233233
},
234234
jshint: {

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"jquery": ">=1.6 <1.11"
1212
},
1313
"devDependencies": {
14-
"jquery-mousewheel": "3.1.0",
14+
"jquery-mousewheel": "3.1.11",
1515
"jshint": "2.4.4",
1616
"qunit": "1.14.0"
1717
}

‎external/jquery.mousewheel.js

Lines changed: 152 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,220 @@
1-
/*! Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net)
1+
/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
22
* Licensed under the MIT License (LICENSE.txt).
33
*
4-
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
5-
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
6-
* Thanks to: Seamus Leahy for adding deltaX and deltaY
4+
* Version: 3.1.11
75
*
8-
* Version: 3.1.0
9-
*
10-
* Requires: 1.2.2+
6+
* Requires: jQuery 1.2.2+
117
*/
128

139
(function (factory) {
14-
if (typeof define === 'function' && define.amd) {
10+
if ( typeof define === 'function' && define.amd ) {
1511
// AMD. Register as an anonymous module.
1612
define(['jquery'], factory);
13+
} else if (typeof exports === 'object') {
14+
// Node/CommonJS style for Browserify
15+
module.exports = factory;
1716
} else {
1817
// Browser globals
1918
factory(jQuery);
2019
}
2120
}(function ($) {
2221

23-
var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll'];
24-
var toBind = 'onwheel' in document || document.documentMode >= 9 ? ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'];
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+
nullLowestDeltaTimeout, lowestDelta;
2627

27-
if ($.event.fixHooks) {
28-
for ( var i=toFix.length; i; ) {
28+
if ( $.event.fixHooks ) {
29+
for ( var i = toFix.length; i; ) {
2930
$.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
3031
}
3132
}
3233

33-
$.event.special.mousewheel = {
34+
var special = $.event.special.mousewheel = {
35+
version: '3.1.11',
36+
3437
setup: function() {
3538
if ( this.addEventListener ) {
36-
for ( var i=toBind.length; i; ) {
39+
for ( var i = toBind.length; i; ) {
3740
this.addEventListener( toBind[--i], handler, false );
3841
}
3942
} else {
4043
this.onmousewheel = handler;
4144
}
45+
// Store the line height and page height for this particular element
46+
$.data(this, 'mousewheel-line-height', special.getLineHeight(this));
47+
$.data(this, 'mousewheel-page-height', special.getPageHeight(this));
4248
},
4349

4450
teardown: function() {
4551
if ( this.removeEventListener ) {
46-
for ( var i=toBind.length; i; ) {
52+
for ( var i = toBind.length; i; ) {
4753
this.removeEventListener( toBind[--i], handler, false );
4854
}
4955
} else {
5056
this.onmousewheel = null;
5157
}
58+
// Clean up the data we added to the element
59+
$.removeData(this, 'mousewheel-line-height');
60+
$.removeData(this, 'mousewheel-page-height');
61+
},
62+
63+
getLineHeight: function(elem) {
64+
var $parent = $(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
65+
if (!$parent.length) {
66+
$parent = $('body');
67+
}
68+
return parseInt($parent.css('fontSize'), 10);
69+
},
70+
71+
getPageHeight: function(elem) {
72+
return $(elem).height();
73+
},
74+
75+
settings: {
76+
adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
77+
normalizeOffset: true // calls getBoundingClientRect for each event
5278
}
5379
};
5480

5581
$.fn.extend({
5682
mousewheel: function(fn) {
57-
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
83+
return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
5884
},
5985

6086
unmousewheel: function(fn) {
61-
return this.unbind("mousewheel", fn);
87+
return this.unbind('mousewheel', fn);
6288
}
6389
});
6490

6591

6692
function handler(event) {
67-
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, deltaX = 0, deltaY = 0, absDelta = 0, absDeltaXY = 0;
93+
var orgEvent = event || window.event,
94+
args = slice.call(arguments, 1),
95+
delta = 0,
96+
deltaX = 0,
97+
deltaY = 0,
98+
absDelta = 0,
99+
offsetX = 0,
100+
offsetY = 0;
68101
event = $.event.fix(orgEvent);
69-
event.type = "mousewheel";
102+
event.type = 'mousewheel';
70103

71104
// Old school scrollwheel delta
72-
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta; }
73-
if ( orgEvent.detail ) { delta = orgEvent.detail * -1; }
105+
if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
106+
if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
107+
if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
108+
if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
109+
110+
// Firefox < 17 horizontal scrolling related to DOMMouseScroll event
111+
if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
112+
deltaX = deltaY * -1;
113+
deltaY = 0;
114+
}
115+
116+
// Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
117+
delta = deltaY === 0 ? deltaX : deltaY;
74118

75119
// New school wheel delta (wheel event)
76-
if ( orgEvent.deltaY ) {
120+
if ( 'deltaY' in orgEvent ) {
77121
deltaY = orgEvent.deltaY * -1;
78122
delta = deltaY;
79123
}
80-
if ( orgEvent.deltaX ) {
124+
if ( 'deltaX' in orgEvent ) {
81125
deltaX = orgEvent.deltaX;
82-
delta = deltaX * -1;
126+
if ( deltaY === 0 ) { delta = deltaX * -1; }
127+
}
128+
129+
// No change actually happened, no reason to go any further
130+
if ( deltaY === 0 && deltaX === 0 ) { return; }
131+
132+
// Need to convert lines and pages to pixels if we aren't already in pixels
133+
// There are three delta modes:
134+
// * deltaMode 0 is by pixels, nothing to do
135+
// * deltaMode 1 is by lines
136+
// * deltaMode 2 is by pages
137+
if ( orgEvent.deltaMode === 1 ) {
138+
var lineHeight = $.data(this, 'mousewheel-line-height');
139+
delta *= lineHeight;
140+
deltaY *= lineHeight;
141+
deltaX *= lineHeight;
142+
} else if ( orgEvent.deltaMode === 2 ) {
143+
var pageHeight = $.data(this, 'mousewheel-page-height');
144+
delta *= pageHeight;
145+
deltaY *= pageHeight;
146+
deltaX *= pageHeight;
83147
}
84148

85-
// Webkit
86-
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY; }
87-
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = orgEvent.wheelDeltaX * -1; }
149+
// Store lowest absolute delta to normalize the delta values
150+
absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
88151

89-
absDelta = Math.abs(delta);
90-
if ( !lowestDelta || absDelta < lowestDelta ) { lowestDelta = absDelta; }
152+
if ( !lowestDelta || absDelta < lowestDelta ) {
153+
lowestDelta = absDelta;
91154

92-
absDeltaXY = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
93-
if ( !lowestDeltaXY || absDeltaXY < lowestDeltaXY ) { lowestDeltaXY = absDeltaXY; }
155+
// Adjust older deltas if necessary
156+
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
157+
lowestDelta /= 40;
158+
}
159+
}
160+
161+
// Adjust older deltas if necessary
162+
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
163+
// Divide all the things by 40!
164+
delta /= 40;
165+
deltaX /= 40;
166+
deltaY /= 40;
167+
}
168+
169+
// Get a whole, normalized value for the deltas
170+
delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
171+
deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
172+
deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
173+
174+
// Normalise offsetX and offsetY properties
175+
if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
176+
var boundingRect = this.getBoundingClientRect();
177+
offsetX = event.clientX - boundingRect.left;
178+
offsetY = event.clientY - boundingRect.top;
179+
}
180+
181+
// Add information to the event object
182+
event.deltaX = deltaX;
183+
event.deltaY = deltaY;
184+
event.deltaFactor = lowestDelta;
185+
event.offsetX = offsetX;
186+
event.offsetY = offsetY;
187+
// Go ahead and set deltaMode to 0 since we converted to pixels
188+
// Although this is a little odd since we overwrite the deltaX/Y
189+
// properties with normalized deltas.
190+
event.deltaMode = 0;
94191

95192
// Add event and delta to the front of the arguments
96-
args.unshift(event, Math.floor(delta/lowestDelta), Math.floor(deltaX/lowestDeltaXY), Math.floor(deltaY/lowestDeltaXY));
193+
args.unshift(event, delta, deltaX, deltaY);
194+
195+
// Clearout lowestDelta after sometime to better
196+
// handle multiple device types that give different
197+
// a different lowestDelta
198+
// Ex: trackpad = 3 and mouse wheel = 120
199+
if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
200+
nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
97201

98202
return ($.event.dispatch || $.event.handle).apply(this, args);
99203
}
100204

205+
function nullLowestDelta() {
206+
lowestDelta = null;
207+
}
208+
209+
function shouldAdjustOldDeltas(orgEvent, absDelta) {
210+
// If this is an older event and the delta is divisable by 120,
211+
// then we are assuming that the browser is treating this as an
212+
// older mouse wheel event and that we should divide the deltas
213+
// by 40 to try and get a more usable deltaFactor.
214+
// Side note, this actually impacts the reported scroll distance
215+
// in older browsers and can cause scrolling to be slower than native.
216+
// Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
217+
return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
218+
}
219+
101220
}));

0 commit comments

Comments
 (0)