Fixed mousewheel scroll distance, some JSLint complaints, corrected minification

README.md

@@ -21,5 +21,5 @@
 ### Notes:
 
 If you aren't using the minified version, be sure to include
-`lib/jquery.mousewheel.min.js` in your page if you require mousewheel
+`lib/jquery.mousewheel.js` in your page if you require mousewheel
 scrolling via fixed columns.

jquery.fixedheadertable.js

@@ -187,7 +187,6 @@
             resize: function(options) {
             	var $self = $(this),
             	self  = this;
-            	
             	return self;
             },
             
@@ -462,13 +461,14 @@
 
 		// bind mousewheel events
 		var maxTop = $fixedColumn.find('.fht-tbody .fht-table').height() - $fixedColumn.find('.fht-tbody').height();
-		console.log(maxTop);
-		$fixedColumn.find('.fht-table').bind('mousewheel', function(event, delta) {
-		    var top = parseInt($(this).css('marginTop'), 10) + (delta > 0 ? 40 : -40);
+		$fixedColumn.find('.fht-table').bind('mousewheel', function(event, delta, deltaX, deltaY) {
+		    if (deltaY == 0) return;
+		    var top = parseInt($(this).css('marginTop'), 10) + (deltaY > 0 ? 120 : -120);
 		    if (top > 0) top = 0;
 		    if (top < -maxTop) top = -maxTop;
 		    $(this).css('marginTop', top);
-		    $fixedBody.find('.fht-tbody').scrollTop(-top);
+		    $fixedBody.find('.fht-tbody').scrollTop(-top).scroll();
+		    return false;
 		});
 
 		

lib/jquery.mousewheel.js

@@ -0,0 +1,90 @@
+/*! 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    
+    var userAgent = navigator.userAgent.toLowerCase();
+    
+    var wheelDeltaScaleFactor = 1;
+    if (jQuery.browser.msie || (jQuery.browser.webkit && !(/chrome/.test(userAgent)))) {
+      wheelDeltaScaleFactor = 40;
+    }
+
+    if (orgEvent.wheelDeltaY !== undefined) { 
+        deltaY = orgEvent.wheelDeltaY / 120 / wheelDeltaScaleFactor;
+    }
+    if (orgEvent.wheelDeltaX !== undefined) {
+        deltaX = -1*orgEvent.wheelDeltaX / 120 / wheelDeltaScaleFactor;
+    }
+    
+    // Add event and delta to the front of the arguments
+    args.unshift(event, delta, deltaX, deltaY);
+    
+    return $.event.handle.apply(this, args);
+}
+
+})(jQuery);

lib/jquery.mousewheel.min.js

@@ -1,12 +0,0 @@
-/* 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(c){var a=["DOMMouseScroll","mousewheel"];c.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var d=a.length;d;){this.addEventListener(a[--d],b,false)}}else{this.onmousewheel=b}},teardown:function(){if(this.removeEventListener){for(var d=a.length;d;){this.removeEventListener(a[--d],b,false)}}else{this.onmousewheel=null}}};c.fn.extend({mousewheel:function(d){return d?this.bind("mousewheel",d):this.trigger("mousewheel")},unmousewheel:function(d){return this.unbind("mousewheel",d)}});function b(i){var g=i||window.event,f=[].slice.call(arguments,1),j=0,h=true,e=0,d=0;i=c.event.fix(g);i.type="mousewheel";if(i.wheelDelta){j=i.wheelDelta/120}if(i.detail){j=-i.detail/3}d=j;if(g.axis!==undefined&&g.axis===g.HORIZONTAL_AXIS){d=0;e=-1*j}if(g.wheelDeltaY!==undefined){d=g.wheelDeltaY/120}if(g.wheelDeltaX!==undefined){e=-1*g.wheelDeltaX/120}f.unshift(i,j,e,d);return c.event.handle.apply(this,f)}})(jQuery);