Update externals to latest mousewheel plugin, drop the version from the fielname while at it

1 files changed, 20 insertions, 14 deletions

diff --git a/external/jquery.mousewheel-3.0.4.js b/external/jquery.mousewheel.js
index dbf8f4b0f..808e12b89 100644
--- a/external/jquery.mousewheel-3.0.4.js
+++ b/external/jquery.mousewheel.js
@@ -1,12 +1,12 @@
-/*! 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 ) {

@@ -24,7 +30,7 @@ $.event.special.mousewheel = {
             this.onmousewheel = handler;

         }

     },

-    

+

     teardown: function() {

         if ( this.removeEventListener ) {

             for ( var i=types.length; i; ) {

@@ -40,7 +46,7 @@ $.fn.extend({
     mousewheel: function(fn) {

         return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");

     },

-    

+

     unmousewheel: function(fn) {

         return this.unbind("mousewheel", fn);

     }

@@ -51,28 +57,28 @@ 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; }

-    

+    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }

+    if ( orgEvent.detail     ) { delta = -orgEvent.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);

+

+    return ($.event.dispatch || $.event.handle).apply(this, args);

 }

 

 })(jQuery);
\ No newline at end of file