Release 0.5.2.

1. Hide suppressed scrollbar rails.

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 node_modules
+bower_components

.jshintrc

@@ -23,7 +23,7 @@
     "devel"         : true,
 
     "strict"        : true,
-    "globalstrict"  : true,
+    "globalstrict"  : false,
 
     "asi"           : false,
     "laxbreak"      : false,

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'
       }
     }
   });

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
@@ -6,14 +6,14 @@ Tiny but perfect jQuery scrollbar plugin
 Why perfect-scrollbar?
 ------------------
 
-I worked on the personal project recently, and I was trying to find the jQuery scrollbar plugin that's *perfect*. But there was no *perfect* scrollbar plugin. That's why I decided to make one.
+I worked on a personal project recently, and I was trying to find the jQuery scrollbar plugin that's *perfect*. But there was no *perfect* scrollbar plugin. That's why I decided to make one.
 
-perfect-scrollbar is very tiny but *perfect*(for me, and maybe for the most of developers) jQuery scrollbar plugin.  
+perfect-scrollbar is very tiny but *perfect* (for me, and maybe for the most of developers) jQuery scrollbar plugin.  
 I hope you love this!
 
 Demo: http://noraesae.github.com/perfect-scrollbar/
 
-What means *perfect*?
+What does *perfect* mean?
 ---------------------
 
 *perfect* means...
@@ -36,19 +36,38 @@ Yes! the only thing that's not *perfect* is my English.
 
 It's cool, isn't it?
 
+Install
+-------
+
+You can download the latest stable version with download links in [Github Page](http://noraesae.github.io/perfect-scrollbar/). You also can find all releases in [Releases](https://github.com/noraesae/perfect-scrollbar/releases) page.
+
+If you want to use the development version of the plugin, use the source files which are not minified. They're in the `src` directory. The development version may be unstable, but some known bugs can be fixed.
+
+```
+git clone https://github.com/noraesae/perfect-scrollbar.git
+cd perfect-scrollbar/src
+```
+
+You can use [Bower](http://bower.io/) to install the plugin. The plugin is registered as `perfect-scrollbar`.
+
+```
+bower install perfect-scrollbar
+```
+
 Requirements
 ------------
 
 To make this plugin *perfect*, some requirements were not avoidable. But they're all very trivial and there's nothing to worry about.
 
 * the container must have a 'position' css style.
+* the container must have an 'overflow:hidden' css style.
 * the scrollbar's position must be 'absolute'.
 * the scrollbar-x must have a 'bottom' css style, and the scrollbar-y must have a 'right' css style.
 
 The requirement below is for perfect-scrollbar <= 0.3.4
 
 * there must be the *one* content element(like div) for the container.
- 
+
 Optional parameters
 -------------------
 
@@ -56,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**
@@ -90,12 +115,20 @@ The number of pixels the content width can surpass the container width without e
 The number of pixels the content height can surpass the container height without enabling the Y axis scroll bar. Allows some "wiggle room" or "offset break", so that Y axis scroll bar is not enabled just because of a few pixels.  
 **Default: 0**
 
+### includePadding
+When set to true, it uses `innerWidth` and `innerHeight` for the container size instead of `width` and `height`. When your container element has non-zero padding and the scrollbar layout looks weird, this option can be helpful.  
+**Default: false**
+
 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>
@@ -134,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
 ------------
 
@@ -166,21 +192,18 @@ From jQuery 2.0, jQuery also will not support IE 6/7/8. I also think that suppor
 
 When old IEs should be supported, please fork the project and make patches personally.
 
+Helpdesk
+--------
+
+If you have any idea to improve this project or any problem using this, please feel free to upload an [issue](https://github.com/noraesae/perfect-scrollbar/issues).
+
 License
 -------
 
-The MIT License (MIT) Copyright (c) 2012 HyeonJe Jun.
+The MIT License (MIT) Copyright (c) 2012, 2014 Hyunje Alex Jun and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**It means, you can freely fork and modify this project for commercial or non-comercial use!**
-
-Helpdesk
---------
-
-If you have any idea to improve this project or any problems using this, please feel free to contact me.  
-Email: noraesae@yuiazu.net

bower.json

@@ -0,0 +1,24 @@
+{
+  "name": "perfect-scrollbar",
+  "version": "0.5.2",
+  "homepage": "http://noraesae.github.io/perfect-scrollbar/",
+  "authors": [
+    "Hyunje Alex Jun <me@noraesae.net>"
+  ],
+  "description": "Tiny but perfect jQuery scrollbar plugin",
+  "main": [
+    "src/perfect-scrollbar.css",
+    "src/perfect-scrollbar.js"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": ">=1.10"
+  }
+}

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>
 

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; }

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; }

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; }

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; }

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>

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 {

examples/rtl.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <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/perfect-scrollbar.js"></script>
+      <style>
+        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
+        .contentHolder .content { background-image: url('./azusa.jpg'); width: 1280px; height: 720px; }
+        .spacer { text-align:center }
+
+        html { direction: rtl; }
+      </style>
+    <script>
+      jQuery(document).ready(function ($) {
+        "use strict";
+        $('#Default').perfectScrollbar();
+      });
+    </script>
+  </head>
+  <body>
+    <div id="Default" class="contentHolder">
+      <div class="content">
+      </div>
+    </div>
+  </body>
+</html>

examples/scrollbars-on-the-opposite-side.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <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/perfect-scrollbar.js"></script>
+      <style>
+        .contentHolder { position:relative; margin:0px auto; padding:0px; width: 600px; height: 400px; overflow: hidden; }
+        .contentHolder .content { background-image: url('./azusa.jpg'); width: 1280px; height: 720px; }
+        .spacer { text-align:center }
+
+        /* Change the alignment of scrollbars */
+        /* Recommended: You can just modify the CSS file directly. */
+        .ps-container .ps-scrollbar-x-rail {
+          top: 3px;
+          bottom: auto; /* If using `top`, there shouldn't be a `bottom`. */
+        }
+        .ps-container .ps-scrollbar-y-rail {
+          left: 3px;
+          right: auto; /* If using `left`, there shouldn't be a `right`. */
+        }
+      </style>
+    <script>
+      jQuery(document).ready(function ($) {
+        "use strict";
+        $('#Default').perfectScrollbar();
+      });
+    </script>
+  </head>
+  <body>
+    <div id="Default" class="contentHolder">
+      <div class="content">
+      </div>
+    </div>
+  </body>
+</html>

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>

min/perfect-scrollbar-0.4.7.min.css

@@ -1,5 +0,0 @@
-/*! perfect-scrollbar - v0.4.7
-* http://noraesae.github.com/perfect-scrollbar/
-* Copyright (c) 2014 Hyeonje Jun; Licensed MIT */
-
-.ps-container .ps-scrollbar-x-rail{position:absolute;bottom:3px;height:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;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;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-x-rail,.ps-container.hover .ps-scrollbar-x-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-x-rail:hover,.ps-container .ps-scrollbar-x-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x-rail.in-scrolling{opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail{position:absolute;right:3px;width:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;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;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-y-rail,.ps-container.hover .ps-scrollbar-y-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-y-rail:hover,.ps-container .ps-scrollbar-y-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail.in-scrolling{opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x{position:absolute;bottom:0;height:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie6 .ps-scrollbar-x{font-size:0}.ps-container .ps-scrollbar-x-rail:hover .ps-scrollbar-x,.ps-container .ps-scrollbar-x-rail.hover .ps-scrollbar-x{background-color:#999}.ps-container .ps-scrollbar-y{position:absolute;right:0;width:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie .ps-scrollbar-y{font-size:0}.ps-container .ps-scrollbar-y-rail:hover .ps-scrollbar-y,.ps-container .ps-scrollbar-y-rail.hover .ps-scrollbar-y{background-color:#999}

min/perfect-scrollbar.min.css

@@ -0,0 +1,5 @@
+/*! perfect-scrollbar - v0.5.2
+* http://noraesae.github.com/perfect-scrollbar/
+* Copyright (c) 2014 Hyunje Alex Jun; Licensed MIT */
+
+.ps-container .ps-scrollbar-x-rail{position:absolute;bottom:3px;height:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;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;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-x-rail,.ps-container.hover .ps-scrollbar-x-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-x-rail:hover,.ps-container .ps-scrollbar-x-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x-rail.in-scrolling{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail{position:absolute;right:3px;width:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;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;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-y-rail,.ps-container.hover .ps-scrollbar-y-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-y-rail:hover,.ps-container .ps-scrollbar-y-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail.in-scrolling{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x{position:absolute;bottom:0;height:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie6 .ps-scrollbar-x{font-size:0}.ps-container .ps-scrollbar-x-rail:hover .ps-scrollbar-x,.ps-container .ps-scrollbar-x-rail.hover .ps-scrollbar-x{background-color:#999}.ps-container .ps-scrollbar-y{position:absolute;right:0;width:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie6 .ps-scrollbar-y{font-size:0}.ps-container .ps-scrollbar-y-rail:hover .ps-scrollbar-y,.ps-container .ps-scrollbar-y-rail.hover .ps-scrollbar-y{background-color:#999}.ps-container.ie .ps-scrollbar-x,.ps-container.ie .ps-scrollbar-y{visibility:hidden}.ps-container.ie:hover .ps-scrollbar-x,.ps-container.ie:hover .ps-scrollbar-y,.ps-container.ie.hover .ps-scrollbar-x,.ps-container.ie.hover .ps-scrollbar-y{visibility:visible}

package.json

@@ -1,6 +1,7 @@
 {
   "name": "perfect-scrollbar",
-  "version": "0.4.7",
+  "version": "0.5.2",
+  "main": "src/perfect-scrollbar.js",
   "engines": {
     "node": ">= 0.8.0"
   },

perfect-scrollbar.jquery.json

@@ -2,10 +2,10 @@
   "name": "perfect-scrollbar",
   "title": "perfect-scrollbar",
   "description": "Tiny but perfect jquery scrollbar plugin.",
-  "version": "0.4.7",
+  "version": "0.5.2",
   "author": {
-    "name": "Hyeonje Jun",
-    "email": "noraesae@yuiazu.net",
+    "name": "Hyunje Alex Jun",
+    "email": "me@noraesae.net",
     "url": "https://github.com/noraesae/"
   },
   "licenses": [
@@ -15,7 +15,7 @@
     }
   ],
   "dependencies": {
-    "jquery": ">=1.8"
+    "jquery": ">=1.10"
   },
   "keywords": [
     "ui",
@@ -29,8 +29,8 @@
   "bugs": "https://github.com/noraesae/perfect-scrollbar/issues/",
   "maintainers": [
     {
-      "name": "Hyeonje Jun",
-      "email": "noraesae@yuiazu.net",
+      "name": "Hyunje Alex Jun",
+      "email": "me@noraesae.net",
       "url": "https://github.com/noraesae/"
     }
   ]

src/jquery.mousewheel.js

@@ -1,84 +0,0 @@
-/*! 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.6
- * 
- * Requires: 1.2.2+
- */
-
-(function($) {
-
-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 ) {
-            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 ( 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.dispatch || $.event.handle).apply(this, args);
-}
-
-})(jQuery);

src/perfect-scrollbar.css

@@ -6,9 +6,9 @@
     -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;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
     -moz-transition: background-color .2s linear, opacity .2s linear;
     transition: background-color .2s linear, opacity .2s linear;
 }
@@ -16,19 +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 {
@@ -41,7 +42,7 @@
     opacity: 0;
     filter: alpha(opacity = 0);
     -o-transition: background-color .2s linear, opacity .2s linear;
-    -webkit-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;
     transition: background-color .2s linear, opacity .2s linear;
 }
@@ -49,19 +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 {
@@ -101,7 +103,7 @@
     transition: background-color .2s linear;
 }
 
-.ps-container.ie .ps-scrollbar-y {
+.ps-container.ie6 .ps-scrollbar-y {
     font-size: 0; /* fixed scrollbar height in xp sp3 ie6 */
 }
 
@@ -109,3 +111,15 @@
 .ps-container .ps-scrollbar-y-rail.hover .ps-scrollbar-y {
     background-color: #999;
 }
+
+.ps-container.ie .ps-scrollbar-x,
+.ps-container.ie .ps-scrollbar-y {
+    visibility: hidden;
+}
+
+.ps-container.ie:hover .ps-scrollbar-x,
+.ps-container.ie:hover .ps-scrollbar-y,
+.ps-container.ie.hover .ps-scrollbar-x,
+.ps-container.ie.hover .ps-scrollbar-y {
+    visibility: visible;
+}

src/perfect-scrollbar.js

@@ -1,28 +1,35 @@
-/* Copyright (c) 2012 HyeonJe Jun (http://github.com/noraesae)
+/* Copyright (c) 2012, 2014 Hyunje Alex Jun and other contributors
  * Licensed under the MIT License
  */
-'use strict';
 (function (factory) {
+  'use strict';
+
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS
+    factory(require('jquery'));
   } else {
     // Browser globals
     factory(jQuery);
   }
 }(function ($) {
+  'use strict';
 
   // The default settings for the plugin
   var defaultSettings = {
-    wheelSpeed: 10,
+    wheelSpeed: 1,
     wheelPropagation: false,
     minScrollbarLength: null,
+    maxScrollbarLength: null,
     useBothWheelAxes: false,
     useKeyboard: true,
     suppressScrollX: false,
     suppressScrollY: false,
     scrollXMarginOffset: 0,
-    scrollYMarginOffset: 0
+    scrollYMarginOffset: 0,
+    includePadding: false
   };
 
   var getEventClassName = (function () {
@@ -88,10 +95,17 @@
           scrollbarXWidth,
           scrollbarXLeft,
           scrollbarXBottom = parseInt($scrollbarXRail.css('bottom'), 10),
+          isScrollbarXUsingBottom = scrollbarXBottom === scrollbarXBottom, // !isNaN
+          scrollbarXTop = isScrollbarXUsingBottom ? null : parseInt($scrollbarXRail.css('top'), 10),
           scrollbarYHeight,
           scrollbarYTop,
           scrollbarYRight = parseInt($scrollbarYRail.css('right'), 10),
-          eventClassName = getEventClassName();
+          isScrollbarYUsingRight = scrollbarYRight === scrollbarYRight, // !isNaN
+          scrollbarYLeft = isScrollbarYUsingRight ? null: parseInt($scrollbarYRail.css('left'), 10),
+          isRtl = $this.css('direction') === "rtl",
+          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,
@@ -109,7 +123,6 @@
 
         var scrollTop = parseInt(scrollbarYTop * (contentHeight - containerHeight) / (containerHeight - scrollbarYHeight), 10);
         $this.scrollTop(scrollTop);
-        $scrollbarXRail.css({bottom: scrollbarXBottom - scrollTop});
       };
 
       var updateContentScrollLeft = function (currentLeft, deltaX) {
@@ -128,26 +141,72 @@
 
         var scrollLeft = parseInt(scrollbarXLeft * (contentWidth - containerWidth) / (containerWidth - scrollbarXWidth), 10);
         $this.scrollLeft(scrollLeft);
-        $scrollbarYRail.css({right: scrollbarYRight - 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;
       };
 
       var updateScrollbarCss = function () {
-        $scrollbarXRail.css({left: $this.scrollLeft(), bottom: scrollbarXBottom - $this.scrollTop(), width: containerWidth, display: settings.suppressScrollX ? "none": "inherit"});
-        $scrollbarYRail.css({top: $this.scrollTop(), right: scrollbarYRight - $this.scrollLeft(), height: containerHeight, display: settings.suppressScrollY ? "none": "inherit"});
-        $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth});
-        $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight});
+        var scrollbarXStyles = {width: containerWidth, display: scrollbarXActive ? "inherit": "none"};
+        if (isRtl) {
+          scrollbarXStyles.left = $this.scrollLeft() + containerWidth - contentWidth;
+        } else {
+          scrollbarXStyles.left = $this.scrollLeft();
+        }
+        if (isScrollbarXUsingBottom) {
+          scrollbarXStyles.bottom = scrollbarXBottom - $this.scrollTop();
+        } else {
+          scrollbarXStyles.top = scrollbarXTop + $this.scrollTop();
+        }
+        $scrollbarXRail.css(scrollbarXStyles);
+
+        var scrollbarYStyles = {top: $this.scrollTop(), height: containerHeight, display: scrollbarYActive ? "inherit": "none"};
+
+        if (isScrollbarYUsingRight) {
+          if (isRtl) {
+            scrollbarYStyles.right = contentWidth - $this.scrollLeft() - scrollbarYRight - $scrollbarY.outerWidth();
+          } else {
+            scrollbarYStyles.right = scrollbarYRight - $this.scrollLeft();
+          }
+        } else {
+          if (isRtl) {
+            scrollbarYStyles.left = $this.scrollLeft() + containerWidth * 2 - contentWidth - scrollbarYLeft - $scrollbarY.outerWidth();
+          } else {
+            scrollbarYStyles.left = scrollbarYLeft + $this.scrollLeft();
+          }
+        }
+        $scrollbarYRail.css(scrollbarYStyles);
+
+        $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 () {
-        containerWidth = $this.width();
-        containerHeight = $this.height();
+        // 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');
         contentHeight = $this.prop('scrollHeight');
 
@@ -183,6 +242,14 @@
         }
 
         updateScrollbarCss();
+
+        // Show scrollbars if needed after updated
+        if (!settings.suppressScrollX) {
+          $scrollbarXRail.show();
+        }
+        if (!settings.suppressScrollY) {
+          $scrollbarYRail.show();
+        }
       };
 
       var bindMouseScrollXHandler = function () {
@@ -200,6 +267,7 @@
         $(document).bind('mousemove' + eventClassName, function (e) {
           if ($scrollbarXRail.hasClass('in-scrolling')) {
             updateContentScrollLeft(currentLeft, e.pageX - currentPageX);
+            updateBarSizeAndPosition();
             e.stopPropagation();
             e.preventDefault();
           }
@@ -230,6 +298,7 @@
         $(document).bind('mousemove' + eventClassName, function (e) {
           if ($scrollbarYRail.hasClass('in-scrolling')) {
             updateContentScrollTop(currentTop, e.pageY - currentPageY);
+            updateBarSizeAndPosition();
             e.stopPropagation();
             e.preventDefault();
           }
@@ -272,7 +341,39 @@
       // bind handlers
       var bindMouseWheelHandler = function () {
         var shouldPrevent = false;
-        $this.bind('mousewheel' + eventClassName, function (e, delta, deltaX, deltaY) {
+
+        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) {
             // deltaX will only be used for horizontal scrolling and deltaY will
             // only be used for vertical scrolling - this is the default
@@ -286,6 +387,7 @@
             } else {
               $this.scrollTop($this.scrollTop() + (deltaX * settings.wheelSpeed));
             }
+            shouldPrevent = true;
           } else if (scrollbarXActive && !scrollbarYActive) {
             // useBothWheelAxes and only horizontal bar is active, so use both
             // wheel axes for horizontal bar
@@ -294,23 +396,24 @@
             } else {
               $this.scrollLeft($this.scrollLeft() - (deltaY * settings.wheelSpeed));
             }
+            shouldPrevent = true;
           }
 
           // update bar position
           updateBarSizeAndPosition();
 
-          shouldPrevent = shouldPreventDefault(deltaX, deltaY);
+          shouldPrevent = (shouldPrevent || shouldPreventDefault(deltaX, deltaY));
           if (shouldPrevent) {
+            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 () {
@@ -324,7 +427,11 @@
 
         var shouldPrevent = false;
         $(document).bind('keydown' + eventClassName, function (e) {
-          if (!hovered) {
+          if (e.isDefaultPrevented && e.isDefaultPrevented()) {
+            return;
+          }
+
+          if (!hovered || $(document.activeElement).is(":input,[contenteditable]")) {
             return;
           }
 
@@ -333,23 +440,23 @@
 
           switch (e.which) {
           case 37: // left
-            deltaX = -3;
+            deltaX = -30;
             break;
           case 38: // up
-            deltaY = 3;
+            deltaY = 30;
             break;
           case 39: // right
-            deltaX = 3;
+            deltaX = 30;
             break;
           case 40: // down
-            deltaY = -3;
+            deltaY = -30;
             break;
           case 33: // page up
-            deltaY = 9;
+            deltaY = 90;
             break;
           case 32: // space bar
           case 34: // page down
-            deltaY = -9;
+            deltaY = -90;
             break;
           case 35: // end
             deltaY = -containerHeight;
@@ -361,8 +468,8 @@
             return;
           }
 
-          $this.scrollTop($this.scrollTop() - (deltaY * settings.wheelSpeed));
-          $this.scrollLeft($this.scrollLeft() + (deltaX * settings.wheelSpeed));
+          $this.scrollTop($this.scrollTop() - deltaY);
+          $this.scrollLeft($this.scrollLeft() + deltaX);
 
           shouldPrevent = shouldPreventDefault(deltaX, deltaY);
           if (shouldPrevent) {
@@ -459,9 +566,13 @@
             startCoords = currentCoords;
 
             var currentTime = (new Date()).getTime();
-            speed.x = differenceX / (currentTime - startTime);
-            speed.y = differenceY / (currentTime - startTime);
-            startTime = currentTime;
+
+            var timeGap = currentTime - startTime;
+            if (timeGap > 0) {
+              speed.x = differenceX / timeGap;
+              speed.y = differenceY / timeGap;
+              startTime = currentTime;
+            }
 
             e.preventDefault();
           }
@@ -501,8 +612,12 @@
         $scrollbarYRail.remove();
 
         // clean all variables
+        $scrollbarXRail =
+        $scrollbarYRail =
         $scrollbarX =
         $scrollbarY =
+        scrollbarXActive =
+        scrollbarYActive =
         containerWidth =
         containerHeight =
         contentWidth =
@@ -510,9 +625,15 @@
         scrollbarXWidth =
         scrollbarXLeft =
         scrollbarXBottom =
+        isScrollbarXUsingBottom =
+        scrollbarXTop =
         scrollbarYHeight =
         scrollbarYTop =
-        scrollbarYRight = null;
+        scrollbarYRight =
+        isScrollbarYUsingRight =
+        scrollbarYLeft =
+        isRtl =
+        eventClassName = null;
       };
 
       var ieSupport = function (version) {
@@ -534,8 +655,22 @@
 
         var fixIe6ScrollbarPosition = function () {
           updateScrollbarCss = function () {
-            $scrollbarX.css({left: scrollbarXLeft + $this.scrollLeft(), bottom: scrollbarXBottom, width: scrollbarXWidth});
-            $scrollbarY.css({top: scrollbarYTop + $this.scrollTop(), right: scrollbarYRight, height: scrollbarYHeight});
+            var scrollbarXStyles = {left: scrollbarXLeft + $this.scrollLeft(), width: scrollbarXWidth};
+            if (isScrollbarXUsingBottom) {
+              scrollbarXStyles.bottom = scrollbarXBottom;
+            } else {
+              scrollbarXStyles.top = scrollbarXTop;
+            }
+            $scrollbarX.css(scrollbarXStyles);
+
+            var scrollbarYStyles = {top: scrollbarYTop + $this.scrollTop(), height: scrollbarYHeight};
+            if (isScrollbarYUsingRight) {
+              scrollbarYStyles.right = scrollbarYRight;
+            } else {
+              scrollbarYStyles.left = scrollbarYLeft;
+            }
+
+            $scrollbarY.css(scrollbarYStyles);
             $scrollbarX.hide().show();
             $scrollbarY.hide().show();
           };
@@ -561,12 +696,11 @@
         bindMouseScrollXHandler();
         bindMouseScrollYHandler();
         bindRailClickHandler();
+        bindMouseWheelHandler();
+
         if (supportsTouch) {
           bindMobileTouchHandler();
         }
-        if ($this.mousewheel) {
-          bindMouseWheelHandler();
-        }
         if (settings.useKeyboard) {
           bindKeyboardHandler();
         }