0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

update jquery.mousewheel.js to work with jquery 1.7

Browse source
This commit is contained in:
j 2012-01-27 17:33:01 +05:30
parent 8d685a891c
commit 198e11c59b
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/Ox.UI/jquery/jquery.mousewheel.js Executable file → Normal file
View file

@ -1,11 +1,11 @@
/*! 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 ) {
@ -53,8 +59,8 @@ function handler(event) {
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;
@ -72,7 +78,7 @@ function handler(event) {
// 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);
})(jQuery);