Update externals to latest mousewheel plugin, drop the version from the fielname...

diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html
index 34866614337842128f2b50c7f6e20dac91bb2ba3..ff51b017797ef10c5c636d1617476d55572c9bdc 100644 (file)
--- 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 0af4c520cbbe4d023afa48080bccf5e642133a1c..87e413da8a34bdb577ed2cfd1f4be9925ab3754e 100644 (file)
--- 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 1827724b9639a7edd5118f18d91ad761f0faaba4..b857a909553ee11aed20ba814f9383d56c5005e5 100644 (file)
--- 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 f4292c56aa3d494d0e047ae02c4010d0f62a520e..eafbd257f4810dc31cbe98fa313e2ea4298ef8aa 100644 (file)
--- 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 312853ddb926fb4a997801511e9557fbbfba8b80..17d1ca30b124e7c1739ea8677f91ffcffe758dae 100644 (file)
--- 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 8f80884863985a000cd6226829d062f218a005b9..a45a801d5f5b9e75a4b0aa54bbd10285bfe327dc 100644 (file)
--- 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-3.0.4.js
deleted file mode 100644 (file)
index dbf8f4b..0000000
--- a/external/jquery.mousewheel-3.0.4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)\r
- * Licensed under the MIT License (LICENSE.txt).\r
- *\r
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.\r
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.\r
- * Thanks to: Seamus Leahy for adding deltaX and deltaY\r
- *\r
- * Version: 3.0.4\r
- * \r
- * Requires: 1.2.2+\r
- */\r
-\r
-(function($) {\r
-\r
-var types = ['DOMMouseScroll', 'mousewheel'];\r
-\r
-$.event.special.mousewheel = {\r
-    setup: function() {\r
-        if ( this.addEventListener ) {\r
-            for ( var i=types.length; i; ) {\r
-                this.addEventListener( types[--i], handler, false );\r
-            }\r
-        } else {\r
-            this.onmousewheel = handler;\r
-        }\r
-    },\r
-    \r
-    teardown: function() {\r
-        if ( this.removeEventListener ) {\r
-            for ( var i=types.length; i; ) {\r
-                this.removeEventListener( types[--i], handler, false );\r
-            }\r
-        } else {\r
-            this.onmousewheel = null;\r
-        }\r
-    }\r
-};\r
-\r
-$.fn.extend({\r
-    mousewheel: function(fn) {\r
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");\r
-    },\r
-    \r
-    unmousewheel: function(fn) {\r
-        return this.unbind("mousewheel", fn);\r
-    }\r
-});\r
-\r
-\r
-function handler(event) {\r
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;\r
-    event = $.event.fix(orgEvent);\r
-    event.type = "mousewheel";\r
-    \r
-    // Old school scrollwheel delta\r
-    if ( event.wheelDelta ) { delta = event.wheelDelta/120; }\r
-    if ( event.detail     ) { delta = -event.detail/3; }\r
-    \r
-    // New school multidimensional scroll (touchpads) deltas\r
-    deltaY = delta;\r
-    \r
-    // Gecko\r
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {\r
-        deltaY = 0;\r
-        deltaX = -1*delta;\r
-    }\r
-    \r
-    // Webkit\r
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }\r
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }\r
-    \r
-    // Add event and delta to the front of the arguments\r
-    args.unshift(event, delta, deltaX, deltaY);\r
-    \r
-    return $.event.handle.apply(this, args);\r
-}\r
-\r
-})(jQuery);
\ No newline at end of file

diff --git a/external/jquery.mousewheel.js b/external/jquery.mousewheel.js
new file mode 100644 (file)
index 0000000..808e12b
--- /dev/null
+++ b/external/jquery.mousewheel.js
@@ -0,0 +1,84 @@
+/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)\r
+ * Licensed under the MIT License (LICENSE.txt).\r
+ *\r
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.\r
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.\r
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY\r
+ *\r
+ * Version: 3.0.6\r
+ *\r
+ * Requires: 1.2.2+\r
+ */\r
+\r
+(function($) {\r
+\r
+var types = ['DOMMouseScroll', 'mousewheel'];\r
+\r
+if ($.event.fixHooks) {\r
+    for ( var i=types.length; i; ) {\r
+        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;\r
+    }\r
+}\r
+\r
+$.event.special.mousewheel = {\r
+    setup: function() {\r
+        if ( this.addEventListener ) {\r
+            for ( var i=types.length; i; ) {\r
+                this.addEventListener( types[--i], handler, false );\r
+            }\r
+        } else {\r
+            this.onmousewheel = handler;\r
+        }\r
+    },\r
+\r
+    teardown: function() {\r
+        if ( this.removeEventListener ) {\r
+            for ( var i=types.length; i; ) {\r
+                this.removeEventListener( types[--i], handler, false );\r
+            }\r
+        } else {\r
+            this.onmousewheel = null;\r
+        }\r
+    }\r
+};\r
+\r
+$.fn.extend({\r
+    mousewheel: function(fn) {\r
+        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");\r
+    },\r
+\r
+    unmousewheel: function(fn) {\r
+        return this.unbind("mousewheel", fn);\r
+    }\r
+});\r
+\r
+\r
+function handler(event) {\r
+    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;\r
+    event = $.event.fix(orgEvent);\r
+    event.type = "mousewheel";\r
+\r
+    // Old school scrollwheel delta\r
+    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }\r
+    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }\r
+\r
+    // New school multidimensional scroll (touchpads) deltas\r
+    deltaY = delta;\r
+\r
+    // Gecko\r
+    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {\r
+        deltaY = 0;\r
+        deltaX = -1*delta;\r
+    }\r
+\r
+    // Webkit\r
+    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }\r
+    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }\r
+\r
+    // Add event and delta to the front of the arguments\r
+    args.unshift(event, delta, deltaX, deltaY);\r
+\r
+    return ($.event.dispatch || $.event.handle).apply(this, args);\r
+}\r
+\r
+})(jQuery);
\ No newline at end of file

diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index b7f4a532ab8ee59c486c4e3afd31c1fd638bc985..1d09bbc38088c21f3f2808a57e876833582aa041 100644 (file)
--- 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">