Merge branch 'soulhunter1987-master'

Author: mzubala

demos/nested.html

@@ -54,6 +54,8 @@ <h2>This container has a scrollbar and contains other scrollable container</h2>
         Phasellus ornare, ante vitae consectetuer consequat, purus sapien ultricies dolor, et mollis pede metus eget
         nisi. Praesent sodales velit quis augue. Cras suscipit, urna at aliquam rhoncus, urna quam viverra nisi, in
         interdum massa nibh nec erat.
+        <input type="text" />
+        <textarea></textarea>
     </div>
     <p>And some more content...</p>
 

jquery.custom-scrollbar.css

@@ -2,6 +2,10 @@
   position: relative;
 }
 
+.scrollable:focus {
+  outline: 0;
+}
+
 .scrollable .viewport {
   position: relative;
   overflow: hidden;

jquery.custom-scrollbar.js

@@ -22,9 +22,6 @@
       if (this.options.hScroll)
         this.hScrollbar = new Scrollbar(this, new HSizing());
       this.$element.data("scrollable", this);
-      if (window.jQueryCustomScrollbars == undefined)
-        window.jQueryCustomScrollbars = [];
-      this.addToScrollbarsHierarchy();
       this.initKeyboardScrolling();
       this.bindEvents();
     }
@@ -58,13 +55,13 @@
       addScrollBarComponents: function () {
         this.assignViewPort();
         if (this.$viewPort.length == 0) {
-          this.$element.wrapInner("<div class=\"viewport\" />")
+          this.$element.wrapInner("<div class=\"viewport\" />");
           this.assignViewPort();
           this.viewPortAdded = true;
         }
         this.assignOverview();
         if (this.$overview.length == 0) {
-          this.$viewPort.wrapInner("<div class=\"overview\" />")
+          this.$viewPort.wrapInner("<div class=\"overview\" />");
           this.assignOverview();
           this.overviewAdded = true;
         }
@@ -135,7 +132,6 @@
         this.removeSkinClass();
         this.removeScrollbarComponents();
         this.$element.data("scrollable", null);
-        window.jQueryCustomScrollbars = null;
         this.removeKeyboardScrolling();
         if (this.vScrollbar)
           this.vScrollbar.remove();
@@ -153,67 +149,27 @@
           (elementOffset.left + $element.width() <= wrappingElementOffset.left + $wrappingElement.width())
       },
 
-      addNested: function (otherScrollable) {
-        if (this.addNestedToOneFromList(this.nestedScrollbars, otherScrollable))
-          return true;
-        else if (this.isInside(otherScrollable.$viewPort, this.$overview)) {
-          this.nestedScrollbars.push(otherScrollable);
-          return true;
-        }
-        else
-          return false;
-      },
-
-      addToScrollbarsHierarchy: function () {
-        this.nestedScrollbars = [];
-        if (!this.addNestedToOneFromList(this, window.jQueryCustomScrollbars))
-          window.jQueryCustomScrollbars.push(this);
-      },
-
-      addNestedToOneFromList: function (scrollable, list) {
-        for (var i = 0; i < list.length; i++) {
-          if (list[i].addNested(scrollable))
-            return true;
-          else if (scrollable.addNested(list[i])) {
-            list[i] = scrollable;
-            return true;
-          }
-        }
-        return false;
-      },
-
-      isMouseOver: function () {
-        for (var i = 0; i < this.nestedScrollbars.length; i++)
-          if (this.nestedScrollbars[i].isMouseOver())
-            return false;
-        var offset = this.$element.offset();
-        var w = this.$element.width();
-        var h = this.$element.height();
-        return this.lastMouseEvent &&
-          (this.lastMouseEvent.pageX >= offset.left) && (this.lastMouseEvent.pageX <= offset.left + w) &&
-          (this.lastMouseEvent.pageY >= offset.top) && (this.lastMouseEvent.pageY <= offset.top + h);
-      },
-
       initKeyboardScrolling: function () {
         var _this = this;
-        this.documentKeydown = function (event) {
-          if (_this.isMouseOver()) {
+
+        this.elementKeydown = function (event) {
+          if (document.activeElement === _this.$element[0]) {
             if (_this.vScrollbar)
               _this.vScrollbar.keyScroll(event);
             if (_this.hScrollbar)
               _this.hScrollbar.keyScroll(event);
           }
         }
-        $(document).keydown(this.documentKeydown);
-        this.documentMousemove = function (event) {
-          _this.lastMouseEvent = event;
-        }
-        $(document).mousemove(this.documentMousemove);
+
+        this.$element
+          .attr('tabindex', '-1')
+          .keydown(this.elementKeydown);
       },
 
       removeKeyboardScrolling: function () {
-        $(document).unbind("keydown", this.documentKeydown);
-        $(document).unbind("mousemove", this.documentMousemove);
+        this.$element
+          .removeAttr('tabindex')
+          .unbind("keydown", this.elementKeydown);
       },
 
       bindEvents: function () {
@@ -290,8 +246,7 @@
         this.scrollable.$element.mousewheel(function (event, delta, deltaX, deltaY) {
           if (_this.enabled) {
             _this.mouseWheelScroll(deltaX, deltaY);
-            event.preventDefault();
-            event.stopPropagation();
+            return false;
           }
         });
       },