fix(noConflict): replaced direct reference to $window.angular

[mbrevoort]

Simple change. Tests passed before and after. I didn't add a test since the proper way to test this is probably to run the entire test suite with noConflict to catch any reference bugs like this and that would be a much larger pull request.

[mbrevoort]

submitted Individual Contributor License Agreement

[eddiemonge]

i dont think you followed the commit message syntax: https://docs.google.com/a/asperasoft.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#

[mbrevoort]

@eddiemonge yeah, sure didn't. Thanks for the link! I just undid my last commit and recommitted with a proper commit message.

[vojtajina]

First, I think current angular.noConflict is broken and we should remove it. See my post on mailing list for more info.

Second, even if you are using noConflict, having multiple versions of angular on a single page, jsonp callbacks should still use one angular.callbacks. The angular.callbacks has to be globally accessible, because it gets called by the JSONP response. Therefore your change breaks JSONP if there are multiple angular versions on the same page.

@mbrevoort do you have a use case where the current solution is broken ? If so, please re-open this pull request.

[mbrevoort]

@vojtajina see my response to your post: https://groups.google.com/d/msg/angular/G8xPyD1F8d0/3MIkFk3U05cJ

I really need noConflict functionality. I would have to drill into the JSONP implementation to understand the complexities there. It doesn't seem like I have permission to reopen this issue. I can only comment on it.