Merge pull request #41 from holidayextras/safari-bug-fix

Fix async xhr issues in safari
holidayextras · Feb 15, 2017 · 6a7a448 · 6a7a448
2 parents 1562fab + aa30506
commit 6a7a448
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/dist/barometer.ie.min.js b/dist/barometer.ie.min.js
diff --git a/dist/barometer.min.js b/dist/barometer.min.js
diff --git a/lib/urlSanitiser.js b/lib/urlSanitiser.js
@@ -3,10 +3,10 @@ module.exports = function (href, hash) {
   var safeUrl = (href || '').split('?')[0]
   safeUrl = safeUrl.replace(/^https?:\/\//i, '')
   if (safeUrl[0] === '/') {
-    safeUrl = (window.location.host || '').replace(/[^a-z0-9-\/]/gi, '_') + '.' + safeUrl.slice(1).replace(/[^a-z0-9-\/]/gi, '_')
+    safeUrl = (window.location.host || '').replace(/[^a-z0-9-/]/gi, '_') + '.' + safeUrl.slice(1).replace(/[^a-z0-9-/]/gi, '_')
   } else {
     safeUrl = safeUrl.split('/')
-    safeUrl = safeUrl.shift().replace(/[^a-z0-9-\/]/gi, '_') + '.' + safeUrl.join('/').replace(/[^a-z0-9-\/]/gi, '_')
+    safeUrl = safeUrl.shift().replace(/[^a-z0-9-/]/gi, '_') + '.' + safeUrl.join('/').replace(/[^a-z0-9-/]/gi, '_')
   }
   if ((hash || '').match(/\?/)) {
     safeUrl += hash.split('?')[0].slice(1).replace(/[^a-z0-9-]/gi, '_')

diff --git a/lib/xhrStats.js b/lib/xhrStats.js
@@ -57,13 +57,16 @@ window.XMLHttpRequest = function () {
   event(req, 'loadend', function (event) {
     setTimeout(function () {
       readyStateTimes.processed = new Date()
-      return xhrStats._logMetrics({
+      var data = {
         type: type.toLowerCase(),
         url: url,
         readyStateTimes: readyStateTimes,
         offset: offset,
         request: req
-      })
+      }
+      try {
+        xhrStats._logMetrics(data)
+      } catch (e) { }
     }, 0)
   })
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "barometer",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Lightweight module to extract performance metrics from a webpage",
   "main": "lib/barometer.js",
   "scripts": {