add compatibility with jQuery 1.7

This commit is contained in:
Brandon Aaron
2011-10-27 08:51:26 -05:00
parent 0f136d8683
commit 9f7185bb58
5 changed files with 26 additions and 9 deletions
+5 -1
View File
@@ -1,5 +1,9 @@
# Mouse Wheel ChangeLog # Mouse Wheel ChangeLog
# 3.0.5
* jQuery 1.7 compatibility
# 3.0.4 # 3.0.4
* Fix IE issue * Fix IE issue
@@ -55,4 +59,4 @@
* Fixed Opera issue * Fixed Opera issue
* Fixed an issue with children elements that also have a mousewheel handler * Fixed an issue with children elements that also have a mousewheel handler
* Added ability to handle multiple handlers * Added ability to handle multiple handlers
+2 -2
View File
@@ -1,4 +1,4 @@
Copyright 2010, Brandon Aaron (http://brandonaaron.net/) Copyright 2011, Brandon Aaron (http://brandonaaron.net/)
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+1 -1
View File
@@ -21,4 +21,4 @@ Here is an example of using both the bind and helper method syntax.
The expandable plugin is licensed under the MIT License (LICENSE.txt). The expandable plugin is licensed under the MIT License (LICENSE.txt).
Copyright (c) 2010 [Brandon Aaron](http://brandonaaron.net) Copyright (c) 2011 [Brandon Aaron](http://brandonaaron.net)
+10 -4
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). * Licensed under the MIT License (LICENSE.txt).
* *
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. * 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: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
* Thanks to: Seamus Leahy for adding deltaX and deltaY * Thanks to: Seamus Leahy for adding deltaX and deltaY
* *
* Version: 3.0.4 * Version: 3.0.5
* *
* Requires: 1.2.2+ * Requires: 1.2.2+
*/ */
@@ -14,6 +14,12 @@
var types = ['DOMMouseScroll', 'mousewheel']; var types = ['DOMMouseScroll', 'mousewheel'];
if ($.event.fixHooks) {
for ( var i=types.length; i; ) {
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
}
}
$.event.special.mousewheel = { $.event.special.mousewheel = {
setup: function() { setup: function() {
if ( this.addEventListener ) { if ( this.addEventListener ) {
@@ -72,7 +78,7 @@ function handler(event) {
// Add event and delta to the front of the arguments // Add event and delta to the front of the arguments
args.unshift(event, delta, deltaX, deltaY); args.unshift(event, delta, deltaX, deltaY);
return $.event.handle.apply(this, args); return ($.event.dispatch || $.event.handle).apply(this, args);
} }
})(jQuery); })(jQuery);
+8 -1
View File
@@ -2,7 +2,14 @@
<html> <html>
<head> <head>
<title>Testing mousewheel plugin</title> <title>Testing mousewheel plugin</title>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js"></script>
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-git.js"></script>-->
<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.4.js"></script>
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.js"></script>-->
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.js"></script>-->
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-1.3.2.js"></script>-->
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-1.2.6.js"></script>-->
<!--<script type="text/javascript" src="http://code.jquery.com/jquery-1.2.2.js"></script>-->
<script type="text/javascript" src="../jquery.mousewheel.js"></script> <script type="text/javascript" src="../jquery.mousewheel.js"></script>
<style> <style>