Better throttling function

bseth99 · Jun 6, 2014 · c656233 · c656233
1 parent e1412d8
commit c656233
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-ui-scrollable",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "ignore": [
     "bower_components",
     "node_modules",

diff --git a/jquery-ui-scrollable.js b/jquery-ui-scrollable.js
@@ -65,28 +65,49 @@
    * End jQuery UI Position
    **/
 
+   /**
+   * throttle from:
+   * http://remysharp.com/2010/07/21/throttling-function-calls/
+   */
+   function throttle(fn, threshhold, scope) {
+     threshhold || (threshhold = 250);
+     var last,
+         deferTimer;
+     return function () {
+       var context = scope || this;
+
+       var now = +new Date,
+           args = arguments;
+       if (last && now < last + threshhold) {
+         // hold on to it
+         clearTimeout(deferTimer);
+         deferTimer = setTimeout(function () {
+           last = now;
+           fn.apply(context, args);
+         }, threshhold);
+       } else {
+         last = now;
+         fn.apply(context, args);
+       }
+     };
+   }
+
    function trackScrolling( scroller ) {
 
       var _waiter = null;
 
-      scroller.onscroll = function ( e ) {
-
-            if ( !_waiter && !scroller.ignoreScrolling ) {
+      scroller.onscroll = throttle( function ( e ) {
 
-               _waiter = setTimeout(function () {
+            if ( !scroller.ignoreScrolling ) {
 
-                  $.each(scroller.watch, function () {
+               $.each(scroller.watch, function () {
 
-                     this._checkPositioning( e );
+                  this._checkPositioning( e );
 
-                  });
-
-                  _waiter = null;
-
-               }, $.osb.scrollable.CONFIG.throttler);
+               });
             }
 
-         }
+         }, $.osb.scrollable.CONFIG.throttler );
 
       //console.log( 'Start listening to scrolling' );
       scroller.element.on('scroll.scrollable', scroller.onscroll);
@@ -163,7 +184,7 @@ window.Scrollable = monitor;
 
    $.widget('osb.scrollable', {
 
-      version: "0.1.4",
+      version: "0.1.5",
 
       widgetEventPrefix: 'scroll',
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
    "name": "jquery-ui-scrollable",
    "title": "jQuery UI Scrollable",
    "description": "Enables monitoring, querying, or changing the scroll position of an element relative to a scrolling  container",
-   "version": "0.1.4",
+   "version": "0.1.5",
    "author": {
       "name": "Ben Olson",
       "url": "http://bseth99.github.com/"