Skip to content

Commit 7c0ef93

Browse files
committed
Merge branch 'master' into updates
Conflicts: bower.json pace.min.js package.json
2 parents 50ade14 + 9386a0a commit 7c0ef93

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

install.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"head": [
44
{
55
"type": "script",
6-
"src": "./pace.js"
6+
"src": "./pace.js",
7+
"moduleType": "global",
8+
"exports": ["Pace"]
79
},
810
{
911
"type": "style",

pace.coffee

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,12 @@ class XHRRequestTracker
449449
# response, all we can do is increment the progress with backoff such that we
450450
# never hit 100% until it's done.
451451
@progress = @progress + (100 - @progress) / 2
452+
, false
452453

453454
for event in ['load', 'abort', 'timeout', 'error']
454455
request.addEventListener event, =>
455456
@progress = 100
457+
, false
456458

457459
else
458460
_onreadystatechange = request.onreadystatechange
@@ -471,6 +473,7 @@ class SocketRequestTracker
471473
for event in ['error', 'open']
472474
request.addEventListener event, =>
473475
@progress = 100
476+
, false
474477

475478
class ElementMonitor
476479
constructor: (options={}) ->

pace.js

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

0 commit comments

Comments
 (0)