Skip to content

Commit 0a1da01

Browse files
committed
Slider: Update to latest mousewheel plugin
1 parent 8da1a75 commit 0a1da01

8 files changed

Lines changed: 85 additions & 67 deletions

File tree

demos/spinner/currency.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>jQuery UI Spinner - Default functionality</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script type="text/javascript" src="../../jquery-1.4.3.js"></script>
8-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.2.js"></script>
8+
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
99
<script type="text/javascript" src="../../external/glob.js"></script>
1010
<script type="text/javascript" src="../../external/glob.de-DE.js"></script>
1111
<script type="text/javascript" src="../../external/glob.ja-JP.js"></script>

demos/spinner/decimal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>jQuery UI Spinner - decimal</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script type="text/javascript" src="../../jquery-1.4.3.js"></script>
8-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.2.js"></script>
8+
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
99
<script type="text/javascript" src="../../external/glob.js"></script>
1010
<script type="text/javascript" src="../../external/glob.de-DE.js"></script>
1111
<script type="text/javascript" src="../../external/glob.ja-JP.js"></script>

demos/spinner/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>jQuery UI Spinner - Default functionality</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script type="text/javascript" src="../../jquery-1.4.3.js"></script>
8-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.2.js"></script>
8+
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
99
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
1010
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
1111
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>

demos/spinner/latlong.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
88
<script type="text/javascript" src="../../jquery-1.4.3.js"></script>
9-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.2.js"></script>
9+
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
1010
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
1111
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
1212
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>

demos/spinner/rtl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>jQuery UI Spinner - Default functionality</title>
66
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
77
<script type="text/javascript" src="../../jquery-1.4.3.js"></script>
8-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.2.js"></script>
8+
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
99
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
1010
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
1111
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>

external/jquery.mousewheel-3.0.2.js

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
2+
* Licensed under the MIT License (LICENSE.txt).
3+
*
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
7+
*
8+
* Version: 3.0.4
9+
*
10+
* Requires: 1.2.2+
11+
*/
12+
13+
(function($) {
14+
15+
var types = ['DOMMouseScroll', 'mousewheel'];
16+
17+
$.event.special.mousewheel = {
18+
setup: function() {
19+
if ( this.addEventListener ) {
20+
for ( var i=types.length; i; ) {
21+
this.addEventListener( types[--i], handler, false );
22+
}
23+
} else {
24+
this.onmousewheel = handler;
25+
}
26+
},
27+
28+
teardown: function() {
29+
if ( this.removeEventListener ) {
30+
for ( var i=types.length; i; ) {
31+
this.removeEventListener( types[--i], handler, false );
32+
}
33+
} else {
34+
this.onmousewheel = null;
35+
}
36+
}
37+
};
38+
39+
$.fn.extend({
40+
mousewheel: function(fn) {
41+
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
42+
},
43+
44+
unmousewheel: function(fn) {
45+
return this.unbind("mousewheel", fn);
46+
}
47+
});
48+
49+
50+
function handler(event) {
51+
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
52+
event = $.event.fix(orgEvent);
53+
event.type = "mousewheel";
54+
55+
// Old school scrollwheel delta
56+
if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
57+
if ( event.detail ) { delta = -event.detail/3; }
58+
59+
// New school multidimensional scroll (touchpads) deltas
60+
deltaY = delta;
61+
62+
// Gecko
63+
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
64+
deltaY = 0;
65+
deltaX = -1*delta;
66+
}
67+
68+
// Webkit
69+
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
70+
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
71+
72+
// Add event and delta to the front of the arguments
73+
args.unshift(event, delta, deltaX, deltaY);
74+
75+
return $.event.handle.apply(this, args);
76+
}
77+
78+
})(jQuery);

tests/unit/spinner/spinner.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link type="text/css" href="../../../themes/base/jquery.ui.spinner.css" rel="stylesheet" />
77

88
<script type="text/javascript" src="../../../jquery-1.4.3.js"></script>
9-
<script type="text/javascript" src="../../../external/jquery.mousewheel-3.0.2.js"></script>
9+
<script type="text/javascript" src="../../../external/jquery.mousewheel-3.0.4.js"></script>
1010
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
1111
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
1212
<script type="text/javascript" src="../../../ui/jquery.ui.button.js"></script>
@@ -33,7 +33,7 @@ <h2 id="qunit-userAgent"></h2>
3333
</ol>
3434

3535
<div id="qunit-fixture">
36-
<input id="spin">
36+
<input id="spin" class="foo">
3737
<input id="spin2" value="2">
3838
</div>
3939

0 commit comments

Comments
 (0)