Stop safari from blowing up

benediktharter · Nov 1, 2014 · 8de7edb · 8de7edb
1 parent 0c6d06d
commit 8de7edb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ pace
 
 An automatic web page progress bar.
 
-Include [pace.js](https://raw.github.com/HubSpot/pace/v1.0.0/pace.min.js) and a [theme](http://github.hubspot.com/pace/docs/welcome/) of your choice to your page and you are done!
+Include [pace.js](https://raw.github.com/HubSpot/pace/v1.0.2/pace.min.js) and a [theme](http://github.hubspot.com/pace/docs/welcome/) of your choice to your page and you are done!
 
 Pace will automatically monitor your Ajax requests, event loop lag, document ready state and elements on your page to decide on the progress.
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "PACE",
   "main": "pace.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "http://github.hubspot.com/pace/docs/welcome",
   "authors": [
     "Zack Bloom <[email protected]>",

diff --git a/pace.coffee b/pace.coffee
@@ -288,10 +288,11 @@ _WebSocket = window.WebSocket
 extendNative = (to, from) ->
   for key of from::
     try
-      val = from::[key]
+      if val in from
+        val = from::[key]
 
-      if not to[key]? and typeof val isnt 'function'
-        to[key] = val
+        if not to[key]? and typeof val isnt 'function'
+          to[key] = val
     catch e
 
 ignoreStack = []

diff --git a/pace.js b/pace.js
diff --git a/pace.min.js b/pace.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pace",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Automatic page load progress bar",
   "authors": [
     "Zack Bloom <[email protected]>",