Merge pull request #163 from HubSpot/guy_honors_requests

honor requests option Fixes #145

Author: Guy

coffee/requests.coffee

@@ -5,6 +5,7 @@ held = []
 
 waitingOnConfirm = false
 holdRequest = (req) ->
+  return if Offline.getOption('requests') is false
   Offline.trigger 'requests:capture'
 
   if Offline.state isnt 'down'
@@ -13,6 +14,7 @@ holdRequest = (req) ->
   held.push req
 
 makeRequest = ({xhr, url, type, user, password, body}) ->
+  return if Offline.getOption('requests') is false
   xhr.abort()
   xhr.open(type, url, true, user, password)
   xhr.setRequestHeader(name, val) for name, val of xhr.headers
@@ -26,6 +28,7 @@ clear = ->
   held = []
 
 flush = ->
+  return if Offline.getOption('requests') is false
   Offline.trigger 'requests:flush'
 
   requests = {}

js/offline.js

@@ -2,21 +2,21 @@
   var Offline, checkXHR, defaultOptions, extendNative, grab, handlers, init;
 
   extendNative = function(to, from) {
-    var e, key, val, _results;
-    _results = [];
+    var e, key, results, val;
+    results = [];
     for (key in from.prototype) {
       try {
         val = from.prototype[key];
         if ((to[key] == null) && typeof val !== 'function') {
-          _results.push(to[key] = val);
+          results.push(to[key] = val);
         } else {
-          _results.push(void 0);
+          results.push(void 0);
         }
       } catch (_error) {
         e = _error;
       }
     }
-    return _results;
+    return results;
   };
 
   Offline = {};
@@ -48,10 +48,10 @@
   };
 
   grab = function(obj, key) {
-    var cur, i, part, parts, _i, _len;
+    var cur, i, j, len, part, parts;
     cur = obj;
     parts = key.split('.');
-    for (i = _i = 0, _len = parts.length; _i < _len; i = ++_i) {
+    for (i = j = 0, len = parts.length; j < len; i = ++j) {
       part = parts[i];
       cur = cur[part];
       if (typeof cur !== 'object') {
@@ -66,8 +66,8 @@
   };
 
   Offline.getOption = function(key) {
-    var val, _ref;
-    val = (_ref = grab(Offline.options, key)) != null ? _ref : grab(defaultOptions, key);
+    var ref, val;
+    val = (ref = grab(Offline.options, key)) != null ? ref : grab(defaultOptions, key);
     if (typeof val === 'function') {
       return val();
     } else {
@@ -110,15 +110,15 @@
   handlers = {};
 
   Offline.on = function(event, handler, ctx) {
-    var e, events, _i, _len, _results;
+    var e, events, j, len, results;
     events = event.split(' ');
     if (events.length > 1) {
-      _results = [];
-      for (_i = 0, _len = events.length; _i < _len; _i++) {
-        e = events[_i];
-        _results.push(Offline.on(e, handler, ctx));
+      results = [];
+      for (j = 0, len = events.length; j < len; j++) {
+        e = events[j];
+        results.push(Offline.on(e, handler, ctx));
       }
-      return _results;
+      return results;
     } else {
       if (handlers[event] == null) {
         handlers[event] = [];
@@ -128,42 +128,42 @@
   };
 
   Offline.off = function(event, handler) {
-    var ctx, i, _handler, _ref, _results;
+    var _handler, ctx, i, ref, results;
     if (handlers[event] == null) {
       return;
     }
     if (!handler) {
       return handlers[event] = [];
     } else {
       i = 0;
-      _results = [];
+      results = [];
       while (i < handlers[event].length) {
-        _ref = handlers[event][i], ctx = _ref[0], _handler = _ref[1];
+        ref = handlers[event][i], ctx = ref[0], _handler = ref[1];
         if (_handler === handler) {
-          _results.push(handlers[event].splice(i, 1));
+          results.push(handlers[event].splice(i, 1));
         } else {
-          _results.push(i++);
+          results.push(i++);
         }
       }
-      return _results;
+      return results;
     }
   };
 
   Offline.trigger = function(event) {
-    var ctx, handler, _i, _len, _ref, _ref1, _results;
+    var ctx, handler, j, len, ref, ref1, results;
     if (handlers[event] != null) {
-      _ref = handlers[event];
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        _ref1 = _ref[_i], ctx = _ref1[0], handler = _ref1[1];
-        _results.push(handler.call(ctx));
+      ref = handlers[event];
+      results = [];
+      for (j = 0, len = ref.length; j < len; j++) {
+        ref1 = ref[j], ctx = ref1[0], handler = ref1[1];
+        results.push(handler.call(ctx));
       }
-      return _results;
+      return results;
     }
   };
 
   checkXHR = function(xhr, onUp, onDown) {
-    var checkStatus, _onerror, _onload, _onreadystatechange, _ontimeout;
+    var _onerror, _onload, _onreadystatechange, _ontimeout, checkStatus;
     checkStatus = function() {
       if (xhr.status && xhr.status < 12000) {
         return onUp();
@@ -241,7 +241,7 @@
   Offline.confirmUp = Offline.confirmDown = Offline.check;
 
   Offline.onXHR = function(cb) {
-    var monitorXHR, _XDomainRequest, _XMLHttpRequest;
+    var _XDomainRequest, _XMLHttpRequest, monitorXHR;
     monitorXHR = function(req, flags) {
       var _open;
       _open = req.open;
@@ -260,7 +260,7 @@
     };
     _XMLHttpRequest = window.XMLHttpRequest;
     window.XMLHttpRequest = function(flags) {
-      var req, _overrideMimeType, _setRequestHeader;
+      var _overrideMimeType, _setRequestHeader, req;
       req = new _XMLHttpRequest(flags);
       monitorXHR(req, flags);
       _setRequestHeader = req.setRequestHeader;
@@ -291,9 +291,9 @@
 
   init = function() {
     if (Offline.getOption('interceptRequests')) {
-      Offline.onXHR(function(_arg) {
+      Offline.onXHR(function(arg) {
         var xhr;
-        xhr = _arg.xhr;
+        xhr = arg.xhr;
         if (xhr.offline !== false) {
           return checkXHR(xhr, Offline.markUp, Offline.confirmDown);
         }

js/reconnect.js

@@ -10,17 +10,17 @@
   retryIntv = null;
 
   reset = function() {
-    var _ref;
+    var ref;
     if ((rc.state != null) && rc.state !== 'inactive') {
       Offline.trigger('reconnect:stopped');
     }
     rc.state = 'inactive';
-    return rc.remaining = rc.delay = (_ref = Offline.getOption('reconnect.initialDelay')) != null ? _ref : 3;
+    return rc.remaining = rc.delay = (ref = Offline.getOption('reconnect.initialDelay')) != null ? ref : 3;
   };
 
   next = function() {
-    var delay, _ref;
-    delay = (_ref = Offline.getOption('reconnect.delay')) != null ? _ref : Math.min(Math.ceil(rc.delay * 1.5), 3600);
+    var delay, ref;
+    delay = (ref = Offline.getOption('reconnect.delay')) != null ? ref : Math.min(Math.ceil(rc.delay * 1.5), 3600);
     return rc.remaining = rc.delay = delay;
   };
 

js/requests.js

@@ -10,21 +10,27 @@
   waitingOnConfirm = false;
 
   holdRequest = function(req) {
+    if (Offline.getOption('requests') === false) {
+      return;
+    }
     Offline.trigger('requests:capture');
     if (Offline.state !== 'down') {
       waitingOnConfirm = true;
     }
     return held.push(req);
   };
 
-  makeRequest = function(_arg) {
-    var body, name, password, type, url, user, val, xhr, _ref;
-    xhr = _arg.xhr, url = _arg.url, type = _arg.type, user = _arg.user, password = _arg.password, body = _arg.body;
+  makeRequest = function(arg) {
+    var body, name, password, ref, type, url, user, val, xhr;
+    xhr = arg.xhr, url = arg.url, type = arg.type, user = arg.user, password = arg.password, body = arg.body;
+    if (Offline.getOption('requests') === false) {
+      return;
+    }
     xhr.abort();
     xhr.open(type, url, true, user, password);
-    _ref = xhr.headers;
-    for (name in _ref) {
-      val = _ref[name];
+    ref = xhr.headers;
+    for (name in ref) {
+      val = ref[name];
       xhr.setRequestHeader(name, val);
     }
     if (xhr.mimeType) {
@@ -38,11 +44,14 @@
   };
 
   flush = function() {
-    var body, key, request, requests, url, _i, _len;
+    var body, i, key, len, request, requests, url;
+    if (Offline.getOption('requests') === false) {
+      return;
+    }
     Offline.trigger('requests:flush');
     requests = {};
-    for (_i = 0, _len = held.length; _i < _len; _i++) {
-      request = held[_i];
+    for (i = 0, len = held.length; i < len; i++) {
+      request = held[i];
       url = request.url.replace(/(\?|&)_=[0-9]+/, function(match, char) {
         if (char === '?') {
           return char;
@@ -57,9 +66,9 @@
         } else {
           body = body.toString();
         }
-        requests["" + (request.type.toUpperCase()) + " - " + url + " - " + body] = request;
+        requests[(request.type.toUpperCase()) + " - " + url + " - " + body] = request;
       } else {
-        requests["" + (request.type.toUpperCase()) + " - " + url] = request;
+        requests[(request.type.toUpperCase()) + " - " + url] = request;
       }
     }
     for (key in requests) {
@@ -82,7 +91,7 @@
         return waitingOnConfirm = false;
       });
       Offline.onXHR(function(request) {
-        var async, hold, xhr, _onreadystatechange, _send;
+        var _onreadystatechange, _send, async, hold, xhr;
         xhr = request.xhr, async = request.async;
         if (xhr.offline === false) {
           return;

js/simulate.js

@@ -1,19 +1,19 @@
 (function() {
-  var state, _base, _i, _len, _ref;
+  var base, i, len, ref, state;
 
   if (!Offline) {
     throw new Error("Offline simulate brought in without offline.js");
   }
 
-  _ref = ['up', 'down'];
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    state = _ref[_i];
+  ref = ['up', 'down'];
+  for (i = 0, len = ref.length; i < len; i++) {
+    state = ref[i];
     if (document.querySelector("script[data-simulate='" + state + "']") || (typeof localStorage !== "undefined" && localStorage !== null ? localStorage.OFFLINE_SIMULATE : void 0) === state) {
       if (Offline.options == null) {
         Offline.options = {};
       }
-      if ((_base = Offline.options).checks == null) {
-        _base.checks = {};
+      if ((base = Offline.options).checks == null) {
+        base.checks = {};
       }
       Offline.options.checks.active = state;
     }

js/snake.js

@@ -64,8 +64,8 @@
   };
 
   keyHandler = function(e) {
-    var _ref;
-    if ((37 <= (_ref = e.keyCode) && _ref <= 40)) {
+    var ref;
+    if ((37 <= (ref = e.keyCode) && ref <= 40)) {
       snake.direction = Math.PI / 2 * ((e.keyCode - 35) % 4);
       return false;
     }

js/ui.js

@@ -1,5 +1,5 @@
 (function() {
-  var RETRY_TEMPLATE, TEMPLATE, addClass, content, createFromHTML, el, flashClass, flashTimeouts, init, removeClass, render, roundTime, _onreadystatechange;
+  var RETRY_TEMPLATE, TEMPLATE, _onreadystatechange, addClass, content, createFromHTML, el, flashClass, flashTimeouts, init, removeClass, render, roundTime;
 
   if (!window.Offline) {
     throw new Error("Offline UI brought in without offline.js");
@@ -98,10 +98,10 @@
       return removeClass('offline-ui-waiting');
     });
     Offline.on('reconnect:tick', function() {
-      var time, unit, _ref;
+      var ref, time, unit;
       addClass('offline-ui-waiting');
       removeClass('offline-ui-connecting');
-      _ref = roundTime(Offline.reconnect.remaining), time = _ref[0], unit = _ref[1];
+      ref = roundTime(Offline.reconnect.remaining), time = ref[0], unit = ref[1];
       content.setAttribute('data-retry-in-value', time);
       return content.setAttribute('data-retry-in-unit', unit);
     });