Skip to content

Commit ed945f5

Browse files
dmethvindmethvin
committed
Build: Commit source files fixed by ESLint and built by uglifyjs
See previous commit for changes in the tools
1 parent b1a5032 commit ed945f5

File tree

2 files changed

+85
-70
lines changed

2 files changed

+85
-70
lines changed

‎jquery.mousewheel.js‎

Lines changed: 84 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,80 @@
11
/*!
22
* jQuery Mousewheel 3.1.13
33
*
4-
* Copyright jQuery Foundation and other contributors
5-
* Released under the MIT license
6-
* http://jquery.org/license
4+
* Copyright OpenJS Foundation and other contributors
75
*/
86

9-
(function (factory) {
10-
if ( typeof define === 'function' && define.amd ) {
7+
( function( factory ) {
8+
if ( typeof define === "function" && define.amd ) {
9+
1110
// AMD. Register as an anonymous module.
12-
define(['jquery'], factory);
13-
} else if (typeof exports === 'object') {
11+
define( [ "jquery" ], factory );
12+
} else if ( typeof exports === "object" ) {
13+
1414
// Node/CommonJS style for Browserify
1515
module.exports = factory;
1616
} else {
17+
1718
// Browser globals
18-
factory(jQuery);
19+
factory( jQuery );
1920
}
20-
}(function ($) {
21+
} )( function( $ ) {
2122

22-
var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
23-
toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
24-
['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
23+
var toFix = [ "wheel", "mousewheel", "DOMMouseScroll", "MozMousePixelScroll" ],
24+
toBind = ( "onwheel" in window.document || window.document.documentMode >= 9 ) ?
25+
[ "wheel" ] : [ "mousewheel", "DomMouseScroll", "MozMousePixelScroll" ],
2526
slice = Array.prototype.slice,
2627
nullLowestDeltaTimeout, lowestDelta;
2728

2829
if ( $.event.fixHooks ) {
2930
for ( var i = toFix.length; i; ) {
30-
$.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
31+
$.event.fixHooks[ toFix[ --i ] ] = $.event.mouseHooks;
3132
}
3233
}
3334

3435
var special = $.event.special.mousewheel = {
35-
version: '3.1.12',
36+
version: "3.1.12",
3637

3738
setup: function() {
3839
if ( this.addEventListener ) {
3940
for ( var i = toBind.length; i; ) {
40-
this.addEventListener( toBind[--i], handler, false );
41+
this.addEventListener( toBind[ --i ], handler, false );
4142
}
4243
} else {
4344
this.onmousewheel = handler;
4445
}
46+
4547
// 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));
48+
$.data( this, "mousewheel-line-height", special.getLineHeight( this ) );
49+
$.data( this, "mousewheel-page-height", special.getPageHeight( this ) );
4850
},
4951

5052
teardown: function() {
5153
if ( this.removeEventListener ) {
5254
for ( var i = toBind.length; i; ) {
53-
this.removeEventListener( toBind[--i], handler, false );
55+
this.removeEventListener( toBind[ --i ], handler, false );
5456
}
5557
} else {
5658
this.onmousewheel = null;
5759
}
60+
5861
// Clean up the data we added to the element
59-
$.removeData(this, 'mousewheel-line-height');
60-
$.removeData(this, 'mousewheel-page-height');
62+
$.removeData( this, "mousewheel-line-height" );
63+
$.removeData( this, "mousewheel-page-height" );
6164
},
6265

63-
getLineHeight: function(elem) {
64-
var $elem = $(elem),
65-
$parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
66-
if (!$parent.length) {
67-
$parent = $('body');
66+
getLineHeight: function( elem ) {
67+
var $elem = $( elem ),
68+
$parent = $elem[ "offsetParent" in $.fn ? "offsetParent" : "parent" ]();
69+
if ( !$parent.length ) {
70+
$parent = $( "body" );
6871
}
69-
return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
72+
return parseInt( $parent.css( "fontSize" ), 10 ) ||
73+
parseInt( $elem.css( "fontSize" ), 10 ) || 16;
7074
},
7175

72-
getPageHeight: function(elem) {
73-
return $(elem).height();
76+
getPageHeight: function( elem ) {
77+
return $( elem ).height();
7478
},
7579

7680
settings: {
@@ -79,37 +83,45 @@
7983
}
8084
};
8185

82-
$.fn.extend({
83-
mousewheel: function(fn) {
84-
return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
86+
$.fn.extend( {
87+
mousewheel: function( fn ) {
88+
return fn ? this.bind( "mousewheel", fn ) : this.trigger( "mousewheel" );
8589
},
8690

87-
unmousewheel: function(fn) {
88-
return this.unbind('mousewheel', fn);
91+
unmousewheel: function( fn ) {
92+
return this.unbind( "mousewheel", fn );
8993
}
90-
});
94+
} );
9195

9296

93-
function handler(event) {
97+
function handler( event ) {
9498
var orgEvent = event || window.event,
95-
args = slice.call(arguments, 1),
99+
args = slice.call( arguments, 1 ),
96100
delta = 0,
97101
deltaX = 0,
98102
deltaY = 0,
99103
absDelta = 0,
100104
offsetX = 0,
101105
offsetY = 0;
102-
event = $.event.fix(orgEvent);
103-
event.type = 'mousewheel';
106+
event = $.event.fix( orgEvent );
107+
event.type = "mousewheel";
104108

105109
// Old school scrollwheel delta
106-
if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
107-
if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
108-
if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
109-
if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
110+
if ( "detail" in orgEvent ) {
111+
deltaY = orgEvent.detail * -1;
112+
}
113+
if ( "wheelDelta" in orgEvent ) {
114+
deltaY = orgEvent.wheelDelta;
115+
}
116+
if ( "wheelDeltaY" in orgEvent ) {
117+
deltaY = orgEvent.wheelDeltaY;
118+
}
119+
if ( "wheelDeltaX" in orgEvent ) {
120+
deltaX = orgEvent.wheelDeltaX * -1;
121+
}
110122

111123
// Firefox < 17 horizontal scrolling related to DOMMouseScroll event
112-
if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
124+
if ( "axis" in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
113125
deltaX = deltaY * -1;
114126
deltaY = 0;
115127
}
@@ -118,59 +130,64 @@
118130
delta = deltaY === 0 ? deltaX : deltaY;
119131

120132
// New school wheel delta (wheel event)
121-
if ( 'deltaY' in orgEvent ) {
133+
if ( "deltaY" in orgEvent ) {
122134
deltaY = orgEvent.deltaY * -1;
123135
delta = deltaY;
124136
}
125-
if ( 'deltaX' in orgEvent ) {
137+
if ( "deltaX" in orgEvent ) {
126138
deltaX = orgEvent.deltaX;
127-
if ( deltaY === 0 ) { delta = deltaX * -1; }
139+
if ( deltaY === 0 ) {
140+
delta = deltaX * -1;
141+
}
128142
}
129143

130144
// No change actually happened, no reason to go any further
131-
if ( deltaY === 0 && deltaX === 0 ) { return; }
145+
if ( deltaY === 0 && deltaX === 0 ) {
146+
return;
147+
}
132148

133149
// Need to convert lines and pages to pixels if we aren't already in pixels
134150
// There are three delta modes:
135151
// * deltaMode 0 is by pixels, nothing to do
136152
// * deltaMode 1 is by lines
137153
// * deltaMode 2 is by pages
138154
if ( orgEvent.deltaMode === 1 ) {
139-
var lineHeight = $.data(this, 'mousewheel-line-height');
155+
var lineHeight = $.data( this, "mousewheel-line-height" );
140156
delta *= lineHeight;
141157
deltaY *= lineHeight;
142158
deltaX *= lineHeight;
143159
} else if ( orgEvent.deltaMode === 2 ) {
144-
var pageHeight = $.data(this, 'mousewheel-page-height');
160+
var pageHeight = $.data( this, "mousewheel-page-height" );
145161
delta *= pageHeight;
146162
deltaY *= pageHeight;
147163
deltaX *= pageHeight;
148164
}
149165

150166
// Store lowest absolute delta to normalize the delta values
151-
absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
167+
absDelta = Math.max( Math.abs( deltaY ), Math.abs( deltaX ) );
152168

153169
if ( !lowestDelta || absDelta < lowestDelta ) {
154170
lowestDelta = absDelta;
155171

156172
// Adjust older deltas if necessary
157-
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
173+
if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) {
158174
lowestDelta /= 40;
159175
}
160176
}
161177

162178
// Adjust older deltas if necessary
163-
if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
179+
if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) {
180+
164181
// Divide all the things by 40!
165182
delta /= 40;
166183
deltaX /= 40;
167184
deltaY /= 40;
168185
}
169186

170187
// Get a whole, normalized value for the deltas
171-
delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
172-
deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
173-
deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
188+
delta = Math[ delta >= 1 ? "floor" : "ceil" ]( delta / lowestDelta );
189+
deltaX = Math[ deltaX >= 1 ? "floor" : "ceil" ]( deltaX / lowestDelta );
190+
deltaY = Math[ deltaY >= 1 ? "floor" : "ceil" ]( deltaY / lowestDelta );
174191

175192
// Normalise offsetX and offsetY properties
176193
if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
@@ -185,37 +202,42 @@
185202
event.deltaFactor = lowestDelta;
186203
event.offsetX = offsetX;
187204
event.offsetY = offsetY;
205+
188206
// Go ahead and set deltaMode to 0 since we converted to pixels
189207
// Although this is a little odd since we overwrite the deltaX/Y
190208
// properties with normalized deltas.
191209
event.deltaMode = 0;
192210

193211
// Add event and delta to the front of the arguments
194-
args.unshift(event, delta, deltaX, deltaY);
212+
args.unshift( event, delta, deltaX, deltaY );
195213

196214
// Clearout lowestDelta after sometime to better
197215
// handle multiple device types that give different
198216
// a different lowestDelta
199217
// Ex: trackpad = 3 and mouse wheel = 120
200-
if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
201-
nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
218+
if ( nullLowestDeltaTimeout ) {
219+
window.clearTimeout( nullLowestDeltaTimeout );
220+
}
221+
nullLowestDeltaTimeout = window.setTimeout( nullLowestDelta, 200 );
202222

203-
return ($.event.dispatch || $.event.handle).apply(this, args);
223+
return ( $.event.dispatch || $.event.handle ).apply( this, args );
204224
}
205225

206226
function nullLowestDelta() {
207227
lowestDelta = null;
208228
}
209229

210-
function shouldAdjustOldDeltas(orgEvent, absDelta) {
230+
function shouldAdjustOldDeltas( orgEvent, absDelta ) {
231+
211232
// If this is an older event and the delta is divisable by 120,
212233
// then we are assuming that the browser is treating this as an
213234
// older mouse wheel event and that we should divide the deltas
214235
// by 40 to try and get a more usable deltaFactor.
215236
// Side note, this actually impacts the reported scroll distance
216237
// in older browsers and can cause scrolling to be slower than native.
217238
// Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
218-
return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
239+
return special.settings.adjustOldDeltas && orgEvent.type === "mousewheel" &&
240+
absDelta % 120 === 0;
219241
}
220242

221-
}));
243+
} );

‎jquery.mousewheel.min.js‎

Lines changed: 1 addition & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)