diff options
| -rw-r--r-- | demos/spinner/currency.html | 2 | ||||
| -rw-r--r-- | demos/spinner/decimal.html | 2 | ||||
| -rw-r--r-- | demos/spinner/default.html | 2 | ||||
| -rw-r--r-- | demos/spinner/latlong.html | 2 | ||||
| -rw-r--r-- | demos/spinner/overflow.html | 2 | ||||
| -rw-r--r-- | demos/spinner/time.html | 2 | ||||
| -rw-r--r-- | external/jquery.mousewheel.js (renamed from external/jquery.mousewheel-3.0.4.js) | 34 | ||||
| -rw-r--r-- | tests/unit/spinner/spinner.html | 2 |
8 files changed, 27 insertions, 21 deletions
diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html index 348666143..ff51b0177 100644 --- a/demos/spinner/currency.html +++ b/demos/spinner/currency.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> <script src="../../external/globalize.culture.ja-JP.js"></script> diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html index 0af4c520c..87e413da8 100644 --- a/demos/spinner/decimal.html +++ b/demos/spinner/decimal.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Decimal</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> <script src="../../external/globalize.culture.ja-JP.js"></script> diff --git a/demos/spinner/default.html b/demos/spinner/default.html index 1827724b9..b857a9095 100644 --- a/demos/spinner/default.html +++ b/demos/spinner/default.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.button.js"></script> diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html index f4292c56a..eafbd257f 100644 --- a/demos/spinner/latlong.html +++ b/demos/spinner/latlong.html @@ -6,7 +6,7 @@ <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="http://maps.google.com/maps/api/js?sensor=false"></script> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.button.js"></script> diff --git a/demos/spinner/overflow.html b/demos/spinner/overflow.html index 312853ddb..17d1ca30b 100644 --- a/demos/spinner/overflow.html +++ b/demos/spinner/overflow.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Overflow</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.button.js"></script> diff --git a/demos/spinner/time.html b/demos/spinner/time.html index 8f8088486..a45a801d5 100644 --- a/demos/spinner/time.html +++ b/demos/spinner/time.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Time</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.7.2.js"></script> - <script src="../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../external/jquery.mousewheel.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> <script src="../../ui/jquery.ui.core.js"></script> diff --git a/external/jquery.mousewheel-3.0.4.js b/external/jquery.mousewheel.js index dbf8f4b0f..808e12b89 100644 --- a/external/jquery.mousewheel-3.0.4.js +++ b/external/jquery.mousewheel.js @@ -1,12 +1,12 @@ -/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
* Licensed under the MIT License (LICENSE.txt).
*
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
* Thanks to: Seamus Leahy for adding deltaX and deltaY
*
- * Version: 3.0.4
- *
+ * Version: 3.0.6
+ *
* Requires: 1.2.2+
*/
@@ -14,6 +14,12 @@ var types = ['DOMMouseScroll', 'mousewheel'];
+if ($.event.fixHooks) {
+ for ( var i=types.length; i; ) {
+ $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
+ }
+}
+
$.event.special.mousewheel = {
setup: function() {
if ( this.addEventListener ) {
@@ -24,7 +30,7 @@ $.event.special.mousewheel = { this.onmousewheel = handler;
}
},
-
+
teardown: function() {
if ( this.removeEventListener ) {
for ( var i=types.length; i; ) {
@@ -40,7 +46,7 @@ $.fn.extend({ mousewheel: function(fn) {
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
},
-
+
unmousewheel: function(fn) {
return this.unbind("mousewheel", fn);
}
@@ -51,28 +57,28 @@ function handler(event) { var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
event = $.event.fix(orgEvent);
event.type = "mousewheel";
-
+
// Old school scrollwheel delta
- if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
- if ( event.detail ) { delta = -event.detail/3; }
-
+ if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
+ if ( orgEvent.detail ) { delta = -orgEvent.detail/3; }
+
// New school multidimensional scroll (touchpads) deltas
deltaY = delta;
-
+
// Gecko
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaY = 0;
deltaX = -1*delta;
}
-
+
// Webkit
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-
+
// Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY);
-
- return $.event.handle.apply(this, args);
+
+ return ($.event.dispatch || $.event.handle).apply(this, args);
}
})(jQuery);
\ No newline at end of file diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html index b7f4a532a..1d09bbc38 100644 --- a/tests/unit/spinner/spinner.html +++ b/tests/unit/spinner/spinner.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner Test Suite</title> <script src="../../jquery.js"></script> - <script src="../../../external/jquery.mousewheel-3.0.4.js"></script> + <script src="../../../external/jquery.mousewheel.js"></script> <script src="../../../external/globalize.js"></script> <script src="../../../external/globalize.culture.ja-JP.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> |