From 0a1da016ffc5081ad1124aa74af778053d58ecb2 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Tue, 26 Oct 2010 10:53:03 +0200 Subject: [PATCH] Slider: Update to latest mousewheel plugin --- demos/spinner/currency.html | 2 +- demos/spinner/decimal.html | 2 +- demos/spinner/default.html | 2 +- demos/spinner/latlong.html | 2 +- demos/spinner/rtl.html | 2 +- external/jquery.mousewheel-3.0.2.js | 60 ---------------------- external/jquery.mousewheel-3.0.4.js | 78 +++++++++++++++++++++++++++++ tests/unit/spinner/spinner.html | 4 +- 8 files changed, 85 insertions(+), 67 deletions(-) delete mode 100644 external/jquery.mousewheel-3.0.2.js create mode 100644 external/jquery.mousewheel-3.0.4.js diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html index 418dca228..0909f4ef5 100644 --- a/demos/spinner/currency.html +++ b/demos/spinner/currency.html @@ -5,7 +5,7 @@ jQuery UI Spinner - Default functionality - + diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html index 82d0fcc20..c47251552 100644 --- a/demos/spinner/decimal.html +++ b/demos/spinner/decimal.html @@ -5,7 +5,7 @@ jQuery UI Spinner - decimal - + diff --git a/demos/spinner/default.html b/demos/spinner/default.html index d90b73f6d..b0f62308d 100644 --- a/demos/spinner/default.html +++ b/demos/spinner/default.html @@ -5,7 +5,7 @@ jQuery UI Spinner - Default functionality - + diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html index 6b955ba47..7c0c9b21a 100644 --- a/demos/spinner/latlong.html +++ b/demos/spinner/latlong.html @@ -6,7 +6,7 @@ - + diff --git a/demos/spinner/rtl.html b/demos/spinner/rtl.html index 52d7b1048..93a2022ff 100644 --- a/demos/spinner/rtl.html +++ b/demos/spinner/rtl.html @@ -5,7 +5,7 @@ jQuery UI Spinner - Default functionality - + diff --git a/external/jquery.mousewheel-3.0.2.js b/external/jquery.mousewheel-3.0.2.js deleted file mode 100644 index 507ab005e..000000000 --- a/external/jquery.mousewheel-3.0.2.js +++ /dev/null @@ -1,60 +0,0 @@ -/*! Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * 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. - * - * Version: 3.0.2 - * - * Requires: 1.2.2+ - */ - -(function($) { - -var types = ['DOMMouseScroll', 'mousewheel']; - -$.event.special.mousewheel = { - setup: function() { - if ( this.addEventListener ) - for ( var i=types.length; i; ) - this.addEventListener( types[--i], handler, false ); - else - this.onmousewheel = handler; - }, - - teardown: function() { - if ( this.removeEventListener ) - for ( var i=types.length; i; ) - this.removeEventListener( types[--i], handler, false ); - else - this.onmousewheel = null; - } -}; - -$.fn.extend({ - mousewheel: function(fn) { - return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); - }, - - unmousewheel: function(fn) { - return this.unbind("mousewheel", fn); - } -}); - - -function handler(event) { - var args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true; - - event = $.event.fix(event || window.event); - event.type = "mousewheel"; - - if ( event.wheelDelta ) delta = event.wheelDelta/120; - if ( event.detail ) delta = -event.detail/3; - - // Add events and delta to the front of the arguments - args.unshift(event, delta); - - return $.event.handle.apply(this, args); -} - -})(jQuery); \ No newline at end of file diff --git a/external/jquery.mousewheel-3.0.4.js b/external/jquery.mousewheel-3.0.4.js new file mode 100644 index 000000000..dbf8f4b0f --- /dev/null +++ b/external/jquery.mousewheel-3.0.4.js @@ -0,0 +1,78 @@ +/*! Copyright (c) 2010 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 + * + * Requires: 1.2.2+ + */ + +(function($) { + +var types = ['DOMMouseScroll', 'mousewheel']; + +$.event.special.mousewheel = { + setup: function() { + if ( this.addEventListener ) { + for ( var i=types.length; i; ) { + this.addEventListener( types[--i], handler, false ); + } + } else { + this.onmousewheel = handler; + } + }, + + teardown: function() { + if ( this.removeEventListener ) { + for ( var i=types.length; i; ) { + this.removeEventListener( types[--i], handler, false ); + } + } else { + this.onmousewheel = null; + } + } +}; + +$.fn.extend({ + mousewheel: function(fn) { + return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); + }, + + unmousewheel: function(fn) { + return this.unbind("mousewheel", fn); + } +}); + + +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; } + + // 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); +} + +})(jQuery); \ No newline at end of file diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html index a9902a251..5868a4590 100644 --- a/tests/unit/spinner/spinner.html +++ b/tests/unit/spinner/spinner.html @@ -6,7 +6,7 @@ - + @@ -33,7 +33,7 @@
- +