Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Fix websocket patch #83

Closed
wants to merge 6 commits into from
Closed

Conversation

IgorMinar
Copy link
Contributor

No description provided.

previously when we detected that patching via descriptors is possible we would patch everything,
but websockets. This change adds descriptor patching for websockets.

I also fixed existing unit test which was incorrectly written. The test now correctly fails without the
patch.

Closes angular#81
@@ -169,7 +169,7 @@ Zone.patchSetClearFn = function (obj, fnNames) {
});
};

Zone.nextId = 1;
Zone.nextId = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

root zone should still be 1

@caitp
Copy link
Contributor

caitp commented Apr 30, 2015

TypeError: Attempting to configurable attribute of unconfigurable property. in /home/travis/build/angular/zone.js/zone.js (line 604)

The original "canPatchViaDescriptor" fix didn't resolve that? :(

@vicb
Copy link
Contributor

vicb commented Apr 30, 2015

@IgorMinar great changes !

wrt id numbering, may be we can cut a bug fix release w/o it (0.4.next) and change it for the next version (0.5) which hopefully will be the "modularized" version ?

@btford
Copy link
Contributor

btford commented May 1, 2015

@vicb – the API is (in theory) private – do you know of anywhere it's used?

@vicb
Copy link
Contributor

vicb commented May 1, 2015

I'm not aware of any usage and I would love to this change. But that is not something we need, it's only cosmetic. So I think it could probably wait a little bit.

@btford
Copy link
Contributor

btford commented May 1, 2015

Hm, okay. @vicb – can you merge the other commits in this PR and create a new PR with just the root zone id fix?

@vicb
Copy link
Contributor

vicb commented May 1, 2015

Today is labor day here, I'm not allowed to work ;)
No pb if it can wait until Monday.

@btford
Copy link
Contributor

btford commented May 1, 2015

Commenting on GitHub is working!

Go enjoy your holiday :P

@IgorMinar
Copy link
Contributor Author

The current patch is not correct. I'm fixing it up.

@IgorMinar
Copy link
Contributor Author

I created #87 for the zone id change per @vicb's request.

@IgorMinar
Copy link
Contributor Author

@caitp

TypeError: Attempting to configurable attribute of unconfigurable property. in /home/travis/build/angular/zone.js/zone.js (line 604)

Is due to #88 and affects only Safari 7.0 but not Safari 7.1.

This will be hard to test because I don't have 7.0 and web sockets don't work via SL (BrowserStack might work though).

@btford
Copy link
Contributor

btford commented May 1, 2015

LGTM, merging.

@btford
Copy link
Contributor

btford commented May 1, 2015

landed as f01263a, 1799a20, e5d8c22, edb17d2, d725f46

@btford btford closed this May 1, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants