Fixed compatibility issues when jquery is included

asafdav · Feb 4, 2014 · 643a4a0 · 643a4a0
1 parent f95e848
commit 643a4a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dist/ng-scrollbar.js b/dist/ng-scrollbar.js
@@ -93,7 +93,7 @@ angular.module('ngScrollbar', []).directive('ngScrollbar', [
             thumbLine.css(draggerLineStyle);
             track.bind('click', trackClick);
             var wheelEvent = win[0].onmousewheel !== undefined ? 'mousewheel' : 'DOMMouseScroll';
-            transculdedContainer.bind(wheelEvent, wheelHandler);
+            transculdedContainer[0].addEventListener(wheelEvent, wheelHandler, false);
             thumb.bind('mousedown', function (event) {
               lastOffsetY = event.pageY - thumb[0].offsetTop;
               win.bind('mouseup', function () {

diff --git a/dist/ng-scrollbar.min.js b/dist/ng-scrollbar.min.js
diff --git a/src/ng-scrollbar.js b/src/ng-scrollbar.js
@@ -131,7 +131,8 @@ angular.module('ngScrollbar', []).
 
             // Handl mousewheel
             var wheelEvent = win[0].onmousewheel !== undefined ? 'mousewheel' : 'DOMMouseScroll';
-            transculdedContainer.bind(wheelEvent, wheelHandler);
+            transculdedContainer[0].addEventListener(wheelEvent, wheelHandler, false);
+
 
             // Drag the scroller
             thumb.bind('mousedown', function(event) {