jquery-mousewheel-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091ff6904ab24e276d443180db638de29f0cef9f
-  data.tar.gz: d558433c382650d87f1b875f8653d5872022a3ca
+  metadata.gz: 47b2139f152bffe38a309543a6941fb2655ccb47
+  data.tar.gz: f665cbc873d508b6cb81b508efc8557a8277dd8e
 SHA512:
-  metadata.gz: 8881145db9b1e0d0be3efe492b28b3d9d2d7be7e37ad4951a71a6182450b4b36beba8076f26654899c825f9940c2b82fd797b509c24a41f5752accf66f980d65
-  data.tar.gz: 25117fd4b49e9f9382b8f5dae69857972a4583c5913aeae5d95580cc6b2ba2370103f672d9e9d99e31ac3c5ee2eec709e4986c2baf120672929f5b1d0fc904eb
+  metadata.gz: b9c65127f445b50466267c0bc0aafcf41cbd7aebc20b68549799889a4811b0044ec930405e7bb6629bee1983b77a5bac77cb87a2e2c7c76fabebb6649097dd90
+  data.tar.gz: b2200b33b24031adf5586835432d971c57540213db6b17589beda5d1bc779ecee5ff726b9c8b98d9fe7d748784e71c1ecb2586f9f5081bb72001ee7f1f53862c

data/Gemfile.lock

@@ -1,47 +1,49 @@
 PATH
   remote: .
   specs:
-    jquery-mousewheel-rails (0.0.7)
+    jquery-mousewheel-rails (0.0.8)
       railties (>= 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     erubis (2.7.0)
-    i18n (0.6.5)
-    jquery-rails (3.0.4)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    minitest (4.7.5)
-    multi_json (1.8.2)
+    json (1.8.1)
+    minitest (5.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    rake (10.3.1)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/lib/jquery-mousewheel-rails/version.rb

@@ -1,3 +1,3 @@
 module JqueryMousewheelRails
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/vendor/assets/javascripts/jquery.mousewheel.js

@@ -1,201 +1,220 @@
 /*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
  * Licensed under the MIT License (LICENSE.txt).
  *
- * Version: 3.1.9
+ * Version: 3.1.11
  *
  * Requires: jQuery 1.2.2+
  */
 
 (function (factory) {
-    if ( typeof define === 'function' && define.amd ) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS style for Browserify
-        module.exports = factory;
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
+  if ( typeof define === 'function' && define.amd ) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS style for Browserify
+    module.exports = factory;
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
 }(function ($) {
 
-    var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
-        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
-            ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
-        slice  = Array.prototype.slice,
-        nullLowestDeltaTimeout, lowestDelta;
+  var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
+      toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+          ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
+      slice  = Array.prototype.slice,
+      nullLowestDeltaTimeout, lowestDelta;
 
-    if ( $.event.fixHooks ) {
-        for ( var i = toFix.length; i; ) {
-            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
-        }
+  if ( $.event.fixHooks ) {
+    for ( var i = toFix.length; i; ) {
+      $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
     }
+  }
 
-    var special = $.event.special.mousewheel = {
-        version: '3.1.9',
-
-        setup: function() {
-            if ( this.addEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.addEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = handler;
-            }
-            // Store the line height and page height for this particular element
-            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
-            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
-        },
-
-        teardown: function() {
-            if ( this.removeEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.removeEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = null;
-            }
-        },
-
-        getLineHeight: function(elem) {
-            return parseInt($(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent']().css('fontSize'), 10);
-        },
-
-        getPageHeight: function(elem) {
-            return $(elem).height();
-        },
-
-        settings: {
-            adjustOldDeltas: true
-        }
-    };
+  var special = $.event.special.mousewheel = {
+    version: '3.1.11',
 
-    $.fn.extend({
-        mousewheel: function(fn) {
-            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
-        },
-
-        unmousewheel: function(fn) {
-            return this.unbind('mousewheel', fn);
+    setup: function() {
+      if ( this.addEventListener ) {
+        for ( var i = toBind.length; i; ) {
+          this.addEventListener( toBind[--i], handler, false );
         }
-    });
-
-
-    function handler(event) {
-        var orgEvent   = event || window.event,
-            args       = slice.call(arguments, 1),
-            delta      = 0,
-            deltaX     = 0,
-            deltaY     = 0,
-            absDelta   = 0;
-        event = $.event.fix(orgEvent);
-        event.type = 'mousewheel';
-
-        // Old school scrollwheel delta
-        if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
-        if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
-        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
-        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
-
-        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
-        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-            deltaX = deltaY * -1;
-            deltaY = 0;
+      } else {
+        this.onmousewheel = handler;
+      }
+      // Store the line height and page height for this particular element
+      $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
+      $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
+    },
+
+    teardown: function() {
+      if ( this.removeEventListener ) {
+        for ( var i = toBind.length; i; ) {
+          this.removeEventListener( toBind[--i], handler, false );
         }
+      } else {
+        this.onmousewheel = null;
+      }
+      // Clean up the data we added to the element
+      $.removeData(this, 'mousewheel-line-height');
+      $.removeData(this, 'mousewheel-page-height');
+    },
+
+    getLineHeight: function(elem) {
+      var $parent = $(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
+      if (!$parent.length) {
+        $parent = $('body');
+      }
+      return parseInt($parent.css('fontSize'), 10);
+    },
+
+    getPageHeight: function(elem) {
+      return $(elem).height();
+    },
+
+    settings: {
+      adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
+      normalizeOffset: true  // calls getBoundingClientRect for each event
+    }
+  };
 
-        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
-        delta = deltaY === 0 ? deltaX : deltaY;
+  $.fn.extend({
+    mousewheel: function(fn) {
+      return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+    },
 
-        // New school wheel delta (wheel event)
-        if ( 'deltaY' in orgEvent ) {
-            deltaY = orgEvent.deltaY * -1;
-            delta  = deltaY;
-        }
-        if ( 'deltaX' in orgEvent ) {
-            deltaX = orgEvent.deltaX;
-            if ( deltaY === 0 ) { delta  = deltaX * -1; }
-        }
+    unmousewheel: function(fn) {
+      return this.unbind('mousewheel', fn);
+    }
+  });
+
+
+  function handler(event) {
+    var orgEvent   = event || window.event,
+        args       = slice.call(arguments, 1),
+        delta      = 0,
+        deltaX     = 0,
+        deltaY     = 0,
+        absDelta   = 0,
+        offsetX    = 0,
+        offsetY    = 0;
+    event = $.event.fix(orgEvent);
+    event.type = 'mousewheel';
+
+    // Old school scrollwheel delta
+    if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
+    if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
+    if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
+    if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
+
+    // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+    if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+      deltaX = deltaY * -1;
+      deltaY = 0;
+    }
 
-        // No change actually happened, no reason to go any further
-        if ( deltaY === 0 && deltaX === 0 ) { return; }
-
-        // Need to convert lines and pages to pixels if we aren't already in pixels
-        // There are three delta modes:
-        //   * deltaMode 0 is by pixels, nothing to do
-        //   * deltaMode 1 is by lines
-        //   * deltaMode 2 is by pages
-        if ( orgEvent.deltaMode === 1 ) {
-            var lineHeight = $.data(this, 'mousewheel-line-height');
-            delta  *= lineHeight;
-            deltaY *= lineHeight;
-            deltaX *= lineHeight;
-        } else if ( orgEvent.deltaMode === 2 ) {
-            var pageHeight = $.data(this, 'mousewheel-page-height');
-            delta  *= pageHeight;
-            deltaY *= pageHeight;
-            deltaX *= pageHeight;
-        }
+    // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
+    delta = deltaY === 0 ? deltaX : deltaY;
 
-        // Store lowest absolute delta to normalize the delta values
-        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+    // New school wheel delta (wheel event)
+    if ( 'deltaY' in orgEvent ) {
+      deltaY = orgEvent.deltaY * -1;
+      delta  = deltaY;
+    }
+    if ( 'deltaX' in orgEvent ) {
+      deltaX = orgEvent.deltaX;
+      if ( deltaY === 0 ) { delta  = deltaX * -1; }
+    }
 
-        if ( !lowestDelta || absDelta < lowestDelta ) {
-            lowestDelta = absDelta;
+    // No change actually happened, no reason to go any further
+    if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+    // Need to convert lines and pages to pixels if we aren't already in pixels
+    // There are three delta modes:
+    //   * deltaMode 0 is by pixels, nothing to do
+    //   * deltaMode 1 is by lines
+    //   * deltaMode 2 is by pages
+    if ( orgEvent.deltaMode === 1 ) {
+      var lineHeight = $.data(this, 'mousewheel-line-height');
+      delta  *= lineHeight;
+      deltaY *= lineHeight;
+      deltaX *= lineHeight;
+    } else if ( orgEvent.deltaMode === 2 ) {
+      var pageHeight = $.data(this, 'mousewheel-page-height');
+      delta  *= pageHeight;
+      deltaY *= pageHeight;
+      deltaX *= pageHeight;
+    }
 
-            // Adjust older deltas if necessary
-            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-                lowestDelta /= 40;
-            }
-        }
+    // Store lowest absolute delta to normalize the delta values
+    absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
 
-        // Adjust older deltas if necessary
-        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-            // Divide all the things by 40!
-            delta  /= 40;
-            deltaX /= 40;
-            deltaY /= 40;
-        }
+    if ( !lowestDelta || absDelta < lowestDelta ) {
+      lowestDelta = absDelta;
 
-        // Get a whole, normalized value for the deltas
-        delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
-        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
-        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
-
-        // Add information to the event object
-        event.deltaX = deltaX;
-        event.deltaY = deltaY;
-        event.deltaFactor = lowestDelta;
-        // Go ahead and set deltaMode to 0 since we converted to pixels
-        // Although this is a little odd since we overwrite the deltaX/Y
-        // properties with normalized deltas.
-        event.deltaMode = 0;
-
-        // Add event and delta to the front of the arguments
-        args.unshift(event, delta, deltaX, deltaY);
-
-        // Clearout lowestDelta after sometime to better
-        // handle multiple device types that give different
-        // a different lowestDelta
-        // Ex: trackpad = 3 and mouse wheel = 120
-        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
-        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
-
-        return ($.event.dispatch || $.event.handle).apply(this, args);
+      // Adjust older deltas if necessary
+      if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+        lowestDelta /= 40;
+      }
     }
 
-    function nullLowestDelta() {
-        lowestDelta = null;
+    // Adjust older deltas if necessary
+    if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+      // Divide all the things by 40!
+      delta  /= 40;
+      deltaX /= 40;
+      deltaY /= 40;
     }
 
-    function shouldAdjustOldDeltas(orgEvent, absDelta) {
-        // If this is an older event and the delta is divisable by 120,
-        // then we are assuming that the browser is treating this as an
-        // older mouse wheel event and that we should divide the deltas
-        // by 40 to try and get a more usable deltaFactor.
-        // Side note, this actually impacts the reported scroll distance
-        // in older browsers and can cause scrolling to be slower than native.
-        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
-        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+    // Get a whole, normalized value for the deltas
+    delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
+    deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+    deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+    // Normalise offsetX and offsetY properties
+    if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
+      var boundingRect = this.getBoundingClientRect();
+      offsetX = event.clientX - boundingRect.left;
+      offsetY = event.clientY - boundingRect.top;
     }
 
+    // Add information to the event object
+    event.deltaX = deltaX;
+    event.deltaY = deltaY;
+    event.deltaFactor = lowestDelta;
+    event.offsetX = offsetX;
+    event.offsetY = offsetY;
+    // Go ahead and set deltaMode to 0 since we converted to pixels
+    // Although this is a little odd since we overwrite the deltaX/Y
+    // properties with normalized deltas.
+    event.deltaMode = 0;
+
+    // Add event and delta to the front of the arguments
+    args.unshift(event, delta, deltaX, deltaY);
+
+    // Clearout lowestDelta after sometime to better
+    // handle multiple device types that give different
+    // a different lowestDelta
+    // Ex: trackpad = 3 and mouse wheel = 120
+    if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+    nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+    return ($.event.dispatch || $.event.handle).apply(this, args);
+  }
+
+  function nullLowestDelta() {
+    lowestDelta = null;
+  }
+
+  function shouldAdjustOldDeltas(orgEvent, absDelta) {
+    // If this is an older event and the delta is divisable by 120,
+    // then we are assuming that the browser is treating this as an
+    // older mouse wheel event and that we should divide the deltas
+    // by 40 to try and get a more usable deltaFactor.
+    // Side note, this actually impacts the reported scroll distance
+    // in older browsers and can cause scrolling to be slower than native.
+    // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
+    return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+  }
+
 }));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-mousewheel-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike MacDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Integrates jquery-mousewheel with rails.