Skip to content

Commit c6846cb

Browse files
committed
Merge pull request CodeByZach#177 from Friss/master
Stop safari from blowing up
2 parents 0c6d06d + 20a7a70 commit c6846cb

File tree

6 files changed

+28
-13
lines changed

6 files changed

+28
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pace
77

88
An automatic web page progress bar.
99

10-
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!
10+
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!
1111

1212
Pace will automatically monitor your Ajax requests, event loop lag, document ready state and elements on your page to decide on the progress.
1313

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "PACE",
33
"main": "pace.js",
4-
"version": "1.0.1",
4+
"version": "1.0.2",
55
"homepage": "http://github.hubspot.com/pace/docs/welcome",
66
"authors": [
77
"Zack Bloom <zackbloom@gmail.com>",

pace.coffee

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,16 @@ _WebSocket = window.WebSocket
288288
extendNative = (to, from) ->
289289
for key of from::
290290
try
291-
val = from::[key]
292-
293-
if not to[key]? and typeof val isnt 'function'
294-
to[key] = val
291+
if not to[key]? and typeof from[key] isnt 'function'
292+
if typeof Object.defineProperty is 'function'
293+
Object.defineProperty(to, key, {
294+
get: ->
295+
return from::[key];
296+
,
297+
configurable: true,
298+
enumerable: true })
299+
else
300+
to[key] = from::[key]
295301
catch e
296302

297303
ignoreStack = []

pace.js

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pace.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pace",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Automatic page load progress bar",
55
"authors": [
66
"Zack Bloom <zackbloom@gmail.com>",

0 commit comments

Comments
 (0)