Skip to content

Commit 719c15e

Browse files
committed
Merge pull request #76 from meteorhacks/update-zones
Update zone.js from upstream
2 parents 719d712 + 0cdcab4 commit 719c15e

File tree

5 files changed

+821
-496
lines changed

5 files changed

+821
-496
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ node_js:
44
before_install:
55
- "curl -L http://git.io/ejPSng | /bin/sh"
66
env:
7-
- METEOR_ENV=test TEST_COMMAND=meteor METEOR_RELEASE=0.9.2.1
7+
- METEOR_ENV=test TEST_COMMAND=meteor METEOR_RELEASE=1.1.0.2
88
- TEST_COMMAND=mrt METEOR_RELEASE=0.8.3

assets/tracer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ extendZone({
5353
// that's why we can access ancesstor properties
5454
// but we are deleting eventMap just after zone ran
5555
// so, we need to create eventMap explicitely to stay it in the current zone
56-
zone.eventMap = zone.eventMap;
56+
zone.eventMap = zone.eventMap || {};
5757

5858
// infoMap is just like eventMap, but it deepCopy all the info
5959
// so only previous zone's info will be exists
60-
zone.infoMap = zone.infoMap;
60+
zone.infoMap = zone.infoMap || {};
6161
if(zone.parent && zone.parent._info) {
6262
var parentInfo = zone.parent._info;
6363
zone.infoMap[zone.parent.id] = {};

0 commit comments

Comments
 (0)