Release 0.5.1.

1. Change dragging logic. 2. Remove jquery-mousewheel dependency. 3. Bug fixes.
Mousewheel fixes for Firefox and IE 10.
2014-09-15 22:58:28 +01:00 · 2014-09-15 22:53:40 +01:00 · 2014-09-15 21:53:23 +01:00 · 2014-09-15 21:45:27 +01:00 · 2014-09-15 21:40:15 +01:00 · 2014-09-15 14:05:34 +01:00
22 changed files with 130 additions and 299 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -21,11 +21,7 @@ module.exports = function (grunt) {
      },
      min: {
        files: {
-          'min/perfect-scrollbar-<%= version %>.min.js': ['src/perfect-scrollbar.js'],
-          'min/perfect-scrollbar-<%= version %>.with-mousewheel.min.js': [
-            'src/perfect-scrollbar.js',
-            'src/jquery.mousewheel.js'
-          ]
+          'min/perfect-scrollbar.min.js': ['src/perfect-scrollbar.js']
        }
      }
    },
@@ -61,7 +57,7 @@ module.exports = function (grunt) {
        cwd: 'src/',
        src: ['perfect-scrollbar.css'],
        dest: 'min/',
-        ext: '-<%= version %>.min.css'
+        ext: '.min.css'
      }
    }
  });
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-perfect-scrollbar
+perfect-scrollbar [![Travis CI](https://travis-ci.org/noraesae/perfect-scrollbar.svg?branch=master)](https://travis-ci.org/noraesae/perfect-scrollbar)
 =================

 Tiny but perfect jQuery scrollbar plugin
@@ -67,7 +67,7 @@ To make this plugin *perfect*, some requirements were not avoidable. But they're
 The requirement below is for perfect-scrollbar &lt;= 0.3.4

 * there must be the *one* content element(like div) for the container.
- 
+
 Optional parameters
 -------------------

@@ -75,16 +75,22 @@ perfect-scrollbar supports optional parameters.

 ### wheelSpeed
 The scroll speed applied to mousewheel event.  
-**Default: 10**
+**Default: 1**

 ### wheelPropagation
 If this option is true, when the scroll reach the end of the side, mousewheel event will be propagated to parent element.  
+*Currently not supported for touch events*  
 **Default: false**

+
 ### minScrollbarLength
 When set to an integer value, the thumb part of the scrollbar will not shrink below that number of pixels.  
 **Default: null**

+### maxScrollbarLength
+When set to an integer value, the thumb part of the scrollbar will not expand over that number of pixels.  
+**Default: null**
+
 ### useBothWheelAxes
 When set to true, and only one (vertical or horizontal) scrollbar is visible then both vertical and horizontal scrolling will affect the scrollbar.  
 **Default: false**
@@ -118,7 +124,11 @@ How to Use

 ```html
 <style>
-  #Demo { position: 'relative'; }
+  #Demo { 
+    position: 'relative';
+    height: 100%; // Or whatever you want (eg. 400px)
+    overflow: hidden;
+  }
 </style>
 <div id='Demo'>
  <div>
@@ -157,13 +167,6 @@ $("#Demo").perfectScrollbar('update');

 Also you can get the informations about how to use the plugin from example codes in the `examples` directory of the source tree.

-Very helpful friends
--------------------
-
-perfect-scrollbar supports [jquery-mousewheel](https://github.com/brandonaaron/jquery-mousewheel). If you want to use mousewheel features, please include jquery-mousewheel before using perfect-scrollbar.
-
-If you want to make this plugin's update function more responsive, [jquery-resize](https://github.com/cowboy/jquery-resize) can be helpful.
-
 Contribution
 ------------

--- a/bower.json
+++ b/bower.json
@@ -1,15 +1,14 @@
 {
  "name": "perfect-scrollbar",
-  "version": "0.4.10",
+  "version": "0.4.11",
  "homepage": "http://noraesae.github.io/perfect-scrollbar/",
  "authors": [
-    "Hyeonje Alex Jun <noraesae@yuiazu.net>"
+    "Hyeonje Alex Jun <me@noraesae.net>"
  ],
  "description": "Tiny but perfect jQuery scrollbar plugin",
  "main": [
-    "min/perfect-scrollbar-0.4.10.min.css",
-    "min/perfect-scrollbar-0.4.10.min.js",
-    "min/perfect-scrollbar-0.4.10.with-mousewheel.min.js"
+    "src/perfect-scrollbar.css",
+    "src/perfect-scrollbar.js"
  ],
  "license": "MIT",
  "ignore": [
@@ -20,6 +19,6 @@
    "tests"
  ],
  "dependencies": {
-    "jquery": "2.x"
+    "jquery": ">=1.10"
  }
 }
--- a/examples/options-default.html
+++ b/examples/options-default.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
@@ -17,6 +16,11 @@
        "use strict";
        $('#Default').perfectScrollbar();
      });
+      var updateSize = function () {
+        var width = parseInt($('#width').val(), 10);
+        var height = parseInt($('#height').val(), 10);
+        $('#Default').width(width).height(height).perfectScrollbar('update');
+      };
    </script>
  </head>
  <body>
@@ -24,6 +28,11 @@
      <div class="content">
      </div>
    </div>
+    <p style='text-align: center'>
+      Width <input type='text' id='width' value='600'>
+      Height <input type='text' id='height' value='400'>
+      <button onclick='updateSize()'>Change!</button>
+    </p>
  </body>
 </html>

--- a/examples/options-minScrollbarLength.html
+++ b/examples/options-minScrollbarLength.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
        <link href="../src/perfect-scrollbar.css" rel="stylesheet">
        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-        <script src="../src/jquery.mousewheel.js"></script>
        <script src="../src/perfect-scrollbar.js"></script>
        <style>
          .contentHolder { position:relative; margin:0px auto; padding:0px; width: 640px; height: 360px; overflow: hidden; }
--- a/examples/options-suppressScrollAxis.html
+++ b/examples/options-suppressScrollAxis.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
--- a/examples/options-useBothWheelAxes.html
+++ b/examples/options-useBothWheelAxes.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
        <link href="../src/perfect-scrollbar.css" rel="stylesheet">
        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-        <script src="../src/jquery.mousewheel.js"></script>
        <script src="../src/perfect-scrollbar.js"></script>
        <style>
          .contentHolder { position:relative; margin:0px auto; padding:0px; width: 640px; height: 360px; overflow: hidden; }
--- a/examples/options-wheelPropagation.html
+++ b/examples/options-wheelPropagation.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
--- a/examples/options-wheelSpeed.html
+++ b/examples/options-wheelSpeed.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
@@ -16,23 +15,23 @@
      jQuery(document).ready(function ($) {
        "use strict";
        $('#Default').perfectScrollbar();
-        $('#FastWheelSpeed').perfectScrollbar({wheelSpeed:100});
-        $('#SlowWheelSpeed').perfectScrollbar({wheelSpeed:1});
+        $('#FastWheelSpeed').perfectScrollbar({wheelSpeed:10});
+        $('#SlowWheelSpeed').perfectScrollbar({wheelSpeed:0.1});
      });
    </script>
  </head>
  <body>
-    <h1 style="text-align:center">Default; wheelSpeed:10</h1>
+    <h1 style="text-align:center">Default; wheelSpeed:1</h1>
    <div id="Default" class="contentHolder">
      <div class="content">
      </div>
    </div>
-    <h1 style="text-align:center">Fast: wheelSpeed:100</h1>
+    <h1 style="text-align:center">Fast: wheelSpeed:10</h1>
    <div id="FastWheelSpeed" class="contentHolder">
      <div class="content">
      </div>
    </div>
-    <h1 style="text-align:center">Slow: wheelSpeed:1</h1>
+    <h1 style="text-align:center">Slow: wheelSpeed:0.1</h1>
    <div id="SlowWheelSpeed" class="contentHolder">
      <div class="content">
      </div>
--- a/examples/reach-the-end-callback.html
+++ b/examples/reach-the-end-callback.html
@@ -6,7 +6,6 @@
    <title>perfect-scrollbar example</title>
    <link href="../src/perfect-scrollbar.css" rel="stylesheet">
    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="../src/jquery.mousewheel.js"></script>
    <script src="../src/perfect-scrollbar.js"></script>
    <style>
      #description {
--- a/examples/rtl.html
+++ b/examples/rtl.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
--- a/examples/scrollbars-on-the-opposite-side.html
+++ b/examples/scrollbars-on-the-opposite-side.html
@@ -5,7 +5,6 @@
    <title>perfect-scrollbar example</title>
      <link href="../src/perfect-scrollbar.css" rel="stylesheet">
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-      <script src="../src/jquery.mousewheel.js"></script>
      <script src="../src/perfect-scrollbar.js"></script>
      <style>
        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
--- a/examples/text-content.html
+++ b/examples/text-content.html
@@ -6,7 +6,6 @@
    <title>perfect-scrollbar example</title>
    <link href="../src/perfect-scrollbar.css" rel="stylesheet">
    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="../src/jquery.mousewheel.js"></script>
    <script src="../src/perfect-scrollbar.js"></script>
    <style>
      #description {
@@ -19,10 +18,7 @@
    </style>
    <script type="text/javascript">
      $(document).ready(function ($) {
-        $('#description').perfectScrollbar({
-          wheelSpeed: 20,
-          wheelPropagation: false
-        });
+        $('#description').perfectScrollbar();
      });
    </script>
  </head>
--- a/min/perfect-scrollbar-0.4.10.min.js
+++ b/min/perfect-scrollbar-0.4.10.min.js
--- a/min/perfect-scrollbar-0.4.10.with-mousewheel.min.js
+++ b/min/perfect-scrollbar-0.4.10.with-mousewheel.min.js
--- a/min/perfect-scrollbar-0.4.10.min.css
+++ b/min/perfect-scrollbar-0.4.10.min.css
@@ -1,4 +1,4 @@
-/*! perfect-scrollbar - v0.4.10
+/*! perfect-scrollbar - v0.5.1
 * http://noraesae.github.com/perfect-scrollbar/
 * Copyright (c) 2014 Hyeonje Alex Jun; Licensed MIT */

--- a/min/perfect-scrollbar.min.js
+++ b/min/perfect-scrollbar.min.js
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
  "name": "perfect-scrollbar",
-  "version": "0.4.10",
+  "version": "0.5.1",
+  "main": "src/perfect-scrollbar.js",
  "engines": {
    "node": ">= 0.8.0"
  },
--- a/perfect-scrollbar.jquery.json
+++ b/perfect-scrollbar.jquery.json
@@ -2,10 +2,10 @@
  "name": "perfect-scrollbar",
  "title": "perfect-scrollbar",
  "description": "Tiny but perfect jquery scrollbar plugin.",
-  "version": "0.4.10",
+  "version": "0.5.1",
  "author": {
    "name": "Hyeonje Alex Jun",
-    "email": "noraesae@yuiazu.net",
+    "email": "me@noraesae.net",
    "url": "https://github.com/noraesae/"
  },
  "licenses": [
@@ -15,7 +15,7 @@
    }
  ],
  "dependencies": {
-    "jquery": ">=1.8"
+    "jquery": ">=1.10"
  },
  "keywords": [
    "ui",
@@ -30,7 +30,7 @@
  "maintainers": [
    {
      "name": "Hyeonje Alex Jun",
-      "email": "noraesae@yuiazu.net",
+      "email": "me@noraesae.net",
      "url": "https://github.com/noraesae/"
    }
  ]
--- a/src/jquery.mousewheel.js
+++ b/src/jquery.mousewheel.js
@@ -1,201 +0,0 @@
-/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Version: 3.1.9
- *
- * 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);
-    }
-}(function ($) {
-
-    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;
-        }
-    }
-
-    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
-        }
-    };
-
-    $.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,
-            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;
-        }
-
-        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
-        delta = deltaY === 0 ? deltaX : deltaY;
-
-        // 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; }
-        }
-
-        // 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;
-        }
-
-        // Store lowest absolute delta to normalize the delta values
-        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
-
-        if ( !lowestDelta || absDelta < lowestDelta ) {
-            lowestDelta = absDelta;
-
-            // Adjust older deltas if necessary
-            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-                lowestDelta /= 40;
-            }
-        }
-
-        // Adjust older deltas if necessary
-        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-            // Divide all the things by 40!
-            delta  /= 40;
-            deltaX /= 40;
-            deltaY /= 40;
-        }
-
-        // 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);
-    }
-
-    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;
-    }
-
-}));
--- a/src/perfect-scrollbar.css
+++ b/src/perfect-scrollbar.css
@@ -6,7 +6,7 @@
    -moz-border-radius: 4px;
    border-radius: 4px;
    opacity: 0;
-    filter: alpha(opacity = 0);
+    filter: alpha(opacity=0);
    -o-transition: background-color .2s linear, opacity .2s linear;
    -webkit-transition: background-color .2s linear, opacity .2s linear;
    -moz-transition: background-color .2s linear, opacity .2s linear;
@@ -16,20 +16,20 @@
 .ps-container:hover .ps-scrollbar-x-rail,
 .ps-container.hover .ps-scrollbar-x-rail {
    opacity: 0.6;
-    filter: alpha(opacity = 60);
+    filter: alpha(opacity=60);
 }

 .ps-container .ps-scrollbar-x-rail:hover,
 .ps-container .ps-scrollbar-x-rail.hover {
    background-color: #eee;
    opacity: 0.9;
-    filter: alpha(opacity = 90);
+    filter: alpha(opacity=90);
 }

 .ps-container .ps-scrollbar-x-rail.in-scrolling {
    background-color: #eee;
    opacity: 0.9;
-    filter: alpha(opacity = 90);
+    filter: alpha(opacity=90);
 }

 .ps-container .ps-scrollbar-y-rail {
@@ -50,20 +50,20 @@
 .ps-container:hover .ps-scrollbar-y-rail,
 .ps-container.hover .ps-scrollbar-y-rail {
    opacity: 0.6;
-    filter: alpha(opacity = 60);
+    filter: alpha(opacity=60);
 }

 .ps-container .ps-scrollbar-y-rail:hover,
 .ps-container .ps-scrollbar-y-rail.hover {
    background-color: #eee;
    opacity: 0.9;
-    filter: alpha(opacity = 90);
+    filter: alpha(opacity=90);
 }

 .ps-container .ps-scrollbar-y-rail.in-scrolling {
    background-color: #eee;
    opacity: 0.9;
-    filter: alpha(opacity = 90);
+    filter: alpha(opacity=90);
 }

 .ps-container .ps-scrollbar-x {
--- a/src/perfect-scrollbar.js
+++ b/src/perfect-scrollbar.js
@@ -19,9 +19,10 @@

  // The default settings for the plugin
  var defaultSettings = {
-    wheelSpeed: 10,
+    wheelSpeed: 1,
    wheelPropagation: false,
    minScrollbarLength: null,
+    maxScrollbarLength: null,
    useBothWheelAxes: false,
    useKeyboard: true,
    suppressScrollX: false,
@@ -102,7 +103,9 @@
          isScrollbarYUsingRight = scrollbarYRight === scrollbarYRight, // !isNaN
          scrollbarYLeft = isScrollbarYUsingRight ? null: parseInt($scrollbarYRail.css('left'), 10),
          isRtl = $this.css('direction') === "rtl",
-          eventClassName = getEventClassName();
+          eventClassName = getEventClassName(),
+          railBorderXWidth = parseInt($scrollbarXRail.css('borderLeftWidth'), 10) + parseInt($scrollbarXRail.css('borderRightWidth'), 10),
+          railBorderYWidth = parseInt($scrollbarXRail.css('borderTopWidth'), 10) + parseInt($scrollbarXRail.css('borderBottomWidth'), 10);

      var updateContentScrollTop = function (currentTop, deltaY) {
        var newTop = currentTop + deltaY,
@@ -120,12 +123,6 @@

        var scrollTop = parseInt(scrollbarYTop * (contentHeight - containerHeight) / (containerHeight - scrollbarYHeight), 10);
        $this.scrollTop(scrollTop);
-
-        if (isScrollbarXUsingBottom) {
-          $scrollbarXRail.css({bottom: scrollbarXBottom - scrollTop});
-        } else {
-          $scrollbarXRail.css({top: scrollbarXTop + scrollTop});
-        }
      };

      var updateContentScrollLeft = function (currentLeft, deltaX) {
@@ -144,18 +141,15 @@

        var scrollLeft = parseInt(scrollbarXLeft * (contentWidth - containerWidth) / (containerWidth - scrollbarXWidth), 10);
        $this.scrollLeft(scrollLeft);
-
-        if (isScrollbarYUsingRight) {
-          $scrollbarYRail.css({right: scrollbarYRight - scrollLeft});
-        } else {
-          $scrollbarYRail.css({left: scrollbarYLeft + scrollLeft});
-        }
      };

      var getSettingsAdjustedThumbSize = function (thumbSize) {
        if (settings.minScrollbarLength) {
          thumbSize = Math.max(thumbSize, settings.minScrollbarLength);
        }
+        if (settings.maxScrollbarLength) {
+          thumbSize = Math.min(thumbSize, settings.maxScrollbarLength);
+        }
        return thumbSize;
      };

@@ -190,11 +184,27 @@
        }
        $scrollbarYRail.css(scrollbarYStyles);

-        $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth});
-        $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight});
+        $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth - railBorderXWidth});
+        $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight - railBorderYWidth});
+
+        if (scrollbarXActive) {
+          $this.addClass('ps-active-x');
+        } else {
+          $this.removeClass('ps-active-x');
+        }
+
+        if (scrollbarYActive) {
+          $this.addClass('ps-active-y');
+        } else {
+          $this.removeClass('ps-active-y');
+        }
      };

      var updateBarSizeAndPosition = function () {
+        // Hide scrollbars not to affect scrollWidth and scrollHeight
+        $scrollbarXRail.hide();
+        $scrollbarYRail.hide();
+
        containerWidth = settings.includePadding ? $this.innerWidth() : $this.width();
        containerHeight = settings.includePadding ? $this.innerHeight() : $this.height();
        contentWidth = $this.prop('scrollWidth');
@@ -232,6 +242,10 @@
        }

        updateScrollbarCss();
+
+        // Show scrollbars again after updated
+        $scrollbarXRail.show();
+        $scrollbarYRail.show();
      };

      var bindMouseScrollXHandler = function () {
@@ -249,6 +263,7 @@
        $(document).bind('mousemove' + eventClassName, function (e) {
          if ($scrollbarXRail.hasClass('in-scrolling')) {
            updateContentScrollLeft(currentLeft, e.pageX - currentPageX);
+            updateBarSizeAndPosition();
            e.stopPropagation();
            e.preventDefault();
          }
@@ -279,6 +294,7 @@
        $(document).bind('mousemove' + eventClassName, function (e) {
          if ($scrollbarYRail.hasClass('in-scrolling')) {
            updateContentScrollTop(currentTop, e.pageY - currentPageY);
+            updateBarSizeAndPosition();
            e.stopPropagation();
            e.preventDefault();
          }
@@ -320,16 +336,38 @@

      // bind handlers
      var bindMouseWheelHandler = function () {
-        // FIXME: Backward compatibility.
-        // After e.deltaFactor applied, wheelSpeed should have smaller value.
-        // Currently, there's no way to change the settings after the scrollbar initialized.
-        // But if the way is implemented in the future, wheelSpeed should be reset.
-        settings.wheelSpeed /= 10;
-
        var shouldPrevent = false;
-        $this.bind('mousewheel' + eventClassName, function (e, deprecatedDelta, deprecatedDeltaX, deprecatedDeltaY) {
-          var deltaX = e.deltaX * e.deltaFactor || deprecatedDeltaX,
-              deltaY = e.deltaY * e.deltaFactor || deprecatedDeltaY;
+
+        var getDeltaFromEvent = function (e) {
+          var deltaX = e.originalEvent.deltaX,
+              deltaY = -1 * e.originalEvent.deltaY;
+
+          if (typeof deltaX === "undefined" || typeof deltaY === "undefined") {
+            // OS X Safari
+            deltaX = -1 * e.originalEvent.wheelDeltaX / 6;
+            deltaY = e.originalEvent.wheelDeltaY / 6;
+          }
+
+          if (e.originalEvent.deltaMode && e.originalEvent.deltaMode === 1) {
+            // Firefox in deltaMode 1: Line scrolling
+            deltaX *= 10;
+            deltaY *= 10;
+          }
+
+          if (deltaX !== deltaX && deltaY !== deltaY/* NaN checks */) {
+            // IE in some mouse drivers
+            deltaX = 0;
+            deltaY = e.originalEvent.wheelDelta;
+          }
+
+          return [deltaX, deltaY];
+        };
+
+        var mousewheelHandler = function (e) {
+          var delta = getDeltaFromEvent(e);
+
+          var deltaX = delta[0],
+              deltaY = delta[1];

          shouldPrevent = false;
          if (!settings.useBothWheelAxes) {
@@ -365,14 +403,13 @@
            e.stopPropagation();
            e.preventDefault();
          }
-        });
+        };

-        // fix Firefox scroll problem
-        $this.bind('MozMousePixelScroll' + eventClassName, function (e) {
-          if (shouldPrevent) {
-            e.preventDefault();
-          }
-        });
+        if (typeof window.onwheel !== "undefined") {
+          $this.bind('wheel' + eventClassName, mousewheelHandler);
+        } else if (typeof window.onmousewheel !== "undefined") {
+          $this.bind('mousewheel' + eventClassName, mousewheelHandler);
+        }
      };

      var bindKeyboardHandler = function () {
@@ -386,6 +423,10 @@

        var shouldPrevent = false;
        $(document).bind('keydown' + eventClassName, function (e) {
+          if (e.isDefaultPrevented && e.isDefaultPrevented()) {
+            return;
+          }
+
          if (!hovered || $(document.activeElement).is(":input,[contenteditable]")) {
            return;
          }
@@ -651,12 +692,11 @@
        bindMouseScrollXHandler();
        bindMouseScrollYHandler();
        bindRailClickHandler();
+        bindMouseWheelHandler();
+
        if (supportsTouch) {
          bindMobileTouchHandler();
        }
-        if ($this.mousewheel) {
-          bindMouseWheelHandler();
-        }
        if (settings.useKeyboard) {
          bindKeyboardHandler();
        }
Author	SHA1	Message	Date
Hyunje Alex Jun	575280e9c2	Release 0.5.1. 1. Change dragging logic. 2. Remove jquery-mousewheel dependency. 3. Bug fixes.	2014-09-15 22:58:28 +01:00
Hyunje Alex Jun	d3181f0b0d	Mousewheel fixes for Firefox and IE 10. Now tested with the latest versions of following browsers. In OS X: Chrome Firefox Safari In Windows: Chrome Firefox Internet Explorer 10 Opera Safari	2014-09-15 22:53:40 +01:00
Hyunje Alex Jun	0fc81dfa83	Remove Firefox hack for MozMousePixelScroll. It just works fine without it.	2014-09-15 21:53:23 +01:00
Hyunje Alex Jun	1d315786a0	Hide scrollbars while updating to stop affecting geometries. Scrollbars keep affecting the geometries and it leads to wrong scrollWidth and scrollHeight. So hide them in advance and show them again after updating.	2014-09-15 21:45:27 +01:00
Hyunje Alex Jun	32a0caf2d8	Change wheelSpeed of text-content example. The default value is changed.	2014-09-15 21:40:15 +01:00
Hyunje Alex Jun	22bffa9ba8	Add update functionality to options-default example. It's useful to test the plugin with the update function.	2014-09-15 14:05:34 +01:00
Hyunje Alex Jun	babd3949c7	Update README.md Gitter doesn't work well.	2014-08-31 01:35:43 +01:00
Hyunje Alex Jun	cbdccf9736	Remove jquery-mousewheel dependencies. Tested under OS X.	2014-08-25 00:35:51 +01:00
Hyunje Alex Jun	a63c136c09	Change `main` property to use non-minified files for bower. https://github.com/noraesae/perfect-scrollbar/issues/133	2014-08-24 23:30:29 +01:00
SideraX	d272206181	Update package.json to be compatible with browerify. Updated: non-minified source is preferred for the `main` property.	2014-08-24 23:23:33 +01:00
Hyunje Alex Jun	a022621df8	Change dragging logic. Using `updateBarSizeAndPosition` instead of manual update of scrollbar CSS styles.	2014-08-07 13:25:46 +01:00
Hyunje Alex Jun	2b87bbe081	Update README.md Add Gitter and Travis CI status.	2014-08-06 20:39:16 +01:00
Hyunje Alex Jun	cee1e3f015	Merge pull request #188 from d42f/master Update perfect-scrollbar.css	2014-08-06 20:27:10 +01:00
d42f	c5f442a70e	Update perfect-scrollbar.css remove spaces	2014-07-29 13:56:38 +04:00
Hyunje Alex Jun	6b35561bb3	Release 0.4.11. 1. Add active- class when scrolls are active 2. Add maxScrollbarLength option 3. Bug fixes	2014-07-16 18:57:45 +01:00
Hyunje Alex Jun	57cc39e6e8	Add 'maxScrollbarLength' option in README.md	2014-07-16 18:56:46 +01:00
Hyunje Alex Jun	3adb98cd40	Merge pull request #174 from ivan1986/patch-1 add maxScrollbarLength.	2014-07-16 18:53:04 +01:00
Martijn Saly	4e90f8c170	Keydown now checks if the event was preventDefault()'ed.	2014-07-16 18:42:40 +01:00
Karol Tomoki Yamazaki	eb13d331d9	Consider border of scrollbar rails. Fixes #176 https://github.com/noraesae/perfect-scrollbar/issues/176	2014-07-16 18:40:57 +01:00
Hyunje Alex Jun	c6f2e6abd3	Merge pull request #159 from sarunas/master Add ps-visible class on container then scrollbar is active.	2014-07-16 18:37:21 +01:00
Hyunje Alex Jun	845452f654	Merge pull request #173 from jlcarvalho/patch-1 Update README.md.	2014-07-16 18:35:51 +01:00
Ivan Borzenkov	49a2a694b9	add maxScrollbarLength	2014-07-09 21:16:16 +04:00
jlcarvalho	1f8a37894b	Update README.md The container must have the properties height and overflow.	2014-07-09 11:26:54 -03:00
Šarūnas Dubinskas	fd56fdfe02	Add ps-active-* class on container then scrollbar is active	2014-07-07 10:42:37 +03:00
Hyunje Alex Jun	6fa5f198e2	Add help text for wheelPropagation option.	2014-07-05 18:01:24 +01:00
Hyunje Alex Jun	f8759f713c	Unify jQuery version dependencies.	2014-07-05 17:46:17 +01:00
Hyunje Alex Jun	4b3b057838	Merge pull request #152 from slopjong/hotfix/version-removed-from-dist-files Removed version from dist file names. Fixes #150.	2014-05-17 10:55:42 +01:00
slopjong	b5675c4d5b	Removed version from dist file names	2014-05-17 06:55:21 +02:00
Hyunje Alex Jun	6e2d95f309	Change emails in json files.	2014-04-29 14:22:02 +01:00