Skip to content

Commit

Permalink
Merge pull request HubSpot#179 from stephanmax/fix-177
Browse files Browse the repository at this point in the history
Fixed issue HubSpot#177 by replacing 'char' with 'chr'
  • Loading branch information
also authored Jun 11, 2016
2 parents ea64d0e + 26fb61a commit 99aceda
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions coffee/requests.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ flush = ->
# TODO: Throw out PUT/POST/DELETE requests after too much time?
for request in held
# Break cache breaking
url = request.url.replace /(\?|&)_=[0-9]+/, (match, char) ->
if char is '?' then char else ''
url = request.url.replace /(\?|&)_=[0-9]+/, (match, chr) ->
if chr is '?' then chr else ''

if Offline.getOption('deDupBody')
body = request.body
Expand Down
6 changes: 3 additions & 3 deletions js/requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
requests = {};
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;
url = request.url.replace(/(\?|&)_=[0-9]+/, function(match, chr) {
if (chr === '?') {
return chr;
} else {
return '';
}
Expand Down
4 changes: 2 additions & 2 deletions offline.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@
var body, i, key, len, request, requests, url;
if (Offline.getOption("requests") !== !1) {
for (Offline.trigger("requests:flush"), requests = {}, i = 0, len = held.length; len > i; i++) request = held[i],
url = request.url.replace(/(\?|&)_=[0-9]+/, function(match, char) {
return "?" === char ? char :"";
url = request.url.replace(/(\?|&)_=[0-9]+/, function(match, chr) {
return "?" === chr ? chr :"";
}), Offline.getOption("deDupBody") ? (body = request.body, body = "[object Object]" === body.toString() ? JSON.stringify(body) :body.toString(),
requests[request.type.toUpperCase() + " - " + url + " - " + body] = request) :requests[request.type.toUpperCase() + " - " + url] = request;
for (key in requests) request = requests[key], makeRequest(request);
Expand Down

0 comments on commit 99aceda

Please sign in to comment.