pacejs_rails 0.4.15 → 0.4.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY4YmMxNGNiNDgxOTM0MWU1YjYyN2U0NmMxNjM5YTg1ZmFlOTQ0Yw==
+    ZGFiYzgyYzJjZGJjMWJjNzNmYWI4M2IwMjE3YjAyMzNkYjkyYWQ4Yg==
   data.tar.gz: !binary |-
-    OWJmODExZjU4YTZmOGM3MGY2MWJhMDUxNjJmYjk0ZWM2YWU5ZDExZg==
+    ZTYyNDE4YTE4MWI3MGRiOGFmM2E2MmQ1ZWMyNjQwZTFkMjU1NjA1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OGI4MzgyNjBjMTE1ODA5MjkzNzgzMDM5MTIxZDI1NTM5ZTI4MWJhZDM0NjQz
-    YjMwMzMxODcyNjhkNGJlZGU5MDI3MTA2YTQxZGY3OTI5NDkyNGI3NDVmZDY3
-    YTQzY2U1YzU2ODQzNWJmMmQ4YWRhN2MzNmJhYTVhNTRjMGQ5NWM=
+    MWUzNDk0Y2Y3OWQzNzQ4ZWY2ZDZkMTNhZTc3ZTk0MTEzMjZkNGU5NDVjNTMw
+    NzA5MmY0ZmJiMDM3ZDVmMzJiMmNjZWNjZTZkOWEzNzhhM2ExMzQ1OWNkNWVm
+    OTRjOWQxNmJkZTgwNDZiZDY3NjU2NDczMjQ1ZDQzNmJkNmE2Mzc=
   data.tar.gz: !binary |-
-    OGFhMjc1NThhYWU2YTgwY2M0NTYxNjIyOTkwMTVkNTQ1ZmFiZTM3Y2QzOGIz
-    NWY0NDQ0ZjY1ZTI0NDYwYWM4NGEwNDg2NDdlZGZhOGFmNWExNDVjZmY5MzM5
-    NGYzMzg3ZjczMDc5N2FmZWU4NWZmNzBmZjE4M2FkY2U0NDZlNzA=
+    YTI5MWVmMWJhY2ZkZTlmNWJiZmUzYTkwNTJiNzZkOTdlODFkOTY4ZTM2N2Nk
+    MWFmZDViMGNmYmIwNTFkM2U3Y2MzNDM0MmZlNGUzMzg5OGEyMjQ5OTM0NWRi
+    NWI4YjJlYjNlOTRiZjhhYmY5MmY2YmNjMzZkNjY4Yzk2MmMxYzE=

data/app/assets/javascripts/pace.js

@@ -1,8 +1,8 @@
+// v 0.4.16
 // Pace.js
-// 0.4.15
 // https://github.com/HubSpot/pace
 (function() {
-  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Events, NoTargetError, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, avgAmplitude, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, getFromDOM, getIntercept, handlePushState, init, now, options, requestAnimationFrame, result, runAnimation, scalers, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _intercept, _pushState, _ref, _replaceState,
+  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Events, NoTargetError, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, avgAmplitude, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, getFromDOM, getIntercept, handlePushState, ignoreStack, init, now, options, requestAnimationFrame, result, runAnimation, scalers, shouldTrack, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _intercept, _pushState, _ref, _replaceState,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -12,7 +12,7 @@
     catchupTime: 500,
     initialRate: .03,
     minTime: 500,
-    ghostTime: 250,
+    ghostTime: 500,
     maxProgressPerFrame: 10,
     easeFactor: 1.25,
     startOnPageLoad: true,
@@ -58,10 +58,14 @@
     tick = function() {
       var diff;
       diff = now() - last;
-      last = now();
-      return fn(diff, function() {
-        return requestAnimationFrame(tick);
-      });
+      if (diff >= 33) {
+        last = now();
+        return fn(diff, function() {
+          return requestAnimationFrame(tick);
+        });
+      } else {
+        return setTimeout(tick, 33 - diff);
+      }
     };
     return tick();
   };
@@ -280,6 +284,44 @@
     return _results;
   };
 
+  ignoreStack = [];
+
+  Pace.ignore = function() {
+    var args, fn, ret;
+    fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    ignoreStack.unshift('ignore');
+    ret = fn.apply(null, args);
+    ignoreStack.shift();
+    return ret;
+  };
+
+  Pace.track = function() {
+    var args, fn, ret;
+    fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    ignoreStack.unshift('track');
+    ret = fn.apply(null, args);
+    ignoreStack.shift();
+    return ret;
+  };
+
+  shouldTrack = function(method) {
+    var _ref1;
+    if (method == null) {
+      method = 'GET';
+    }
+    if (ignoreStack[0] === 'track') {
+      return 'force';
+    }
+    if (!ignoreStack.length && options.ajax) {
+      if (method === 'socket' && options.ajax.trackWebSockets) {
+        return true;
+      } else if (_ref1 = method.toUpperCase(), __indexOf.call(options.ajax.trackMethods, _ref1) >= 0) {
+        return true;
+      }
+    }
+    return false;
+  };
+
   RequestIntercept = (function(_super) {
     __extends(RequestIntercept, _super);
 
@@ -291,8 +333,7 @@
         var _open;
         _open = req.open;
         return req.open = function(type, url, async) {
-          var _ref1;
-          if (_ref1 = (type != null ? type : 'GET').toUpperCase(), __indexOf.call(options.ajax.trackMethods, _ref1) >= 0) {
+          if (shouldTrack(type)) {
             _this.trigger('request', {
               type: type,
               url: url,
@@ -322,12 +363,14 @@
         window.WebSocket = function(url, protocols) {
           var req;
           req = new _WebSocket(url, protocols);
-          _this.trigger('request', {
-            type: 'socket',
-            url: url,
-            protocols: protocols,
-            request: req
-          });
+          if (shouldTrack('socket')) {
+            _this.trigger('request', {
+              type: 'socket',
+              url: url,
+              protocols: protocols,
+              request: req
+            });
+          }
           return req;
         };
         extendNative(window.WebSocket, _WebSocket);
@@ -347,38 +390,40 @@
     return _intercept;
   };
 
-  if (options.restartOnRequestAfter !== false) {
-    getIntercept().on('request', function(_arg) {
-      var args, request, type;
-      type = _arg.type, request = _arg.request;
-      if (!Pace.running) {
-        args = arguments;
-        return setTimeout(function() {
-          var source, stillActive, _i, _len, _ref1, _ref2, _results;
-          if (type === 'socket') {
-            stillActive = request.readyState < 2;
-          } else {
-            stillActive = (0 < (_ref1 = request.readyState) && _ref1 < 4);
-          }
-          if (stillActive) {
-            Pace.restart();
-            _ref2 = Pace.sources;
-            _results = [];
-            for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-              source = _ref2[_i];
-              if (source instanceof AjaxMonitor) {
-                source.watch.apply(source, args);
-                break;
-              } else {
-                _results.push(void 0);
-              }
+  getIntercept().on('request', function(_arg) {
+    var after, args, request, type;
+    type = _arg.type, request = _arg.request;
+    if (!Pace.running && (options.restartOnRequestAfter !== false || shouldTrack(type) === 'force')) {
+      args = arguments;
+      after = options.restartOnRequestAfter || 0;
+      if (typeof after === 'boolean') {
+        after = 0;
+      }
+      return setTimeout(function() {
+        var source, stillActive, _i, _len, _ref1, _ref2, _results;
+        if (type === 'socket') {
+          stillActive = request.readyState < 2;
+        } else {
+          stillActive = (0 < (_ref1 = request.readyState) && _ref1 < 4);
+        }
+        if (stillActive) {
+          Pace.restart();
+          _ref2 = Pace.sources;
+          _results = [];
+          for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+            source = _ref2[_i];
+            if (source instanceof AjaxMonitor) {
+              source.watch.apply(source, args);
+              break;
+            } else {
+              _results.push(void 0);
             }
-            return _results;
           }
-        }, options.restartOnRequestAfter);
-      }
-    });
-  }
+          return _results;
+        }
+      }, after);
+    }
+  });
 
   AjaxMonitor = (function() {
     function AjaxMonitor() {

data/lib/pacejs_rails/version.rb

@@ -1,3 +1,3 @@
 module PacejsRails
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacejs_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler