This repository was archived by the owner on Apr 12, 2024. It is now read-only.
refactor(location): $location now uses urlUtils, not RegEx #3533
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the PR!
If you need to make changes to your pull request, you can update the commit with Thanks again for your help! |
|
Thanks, @mary-poppins. I shortened my message lines. |
| @@ -30,7 +30,7 @@ function $HttpBackendProvider() { | |||
| }]; | |||
| } | |||
|
|
|||
| function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument, locationProtocol) { | |||
There was a problem hiding this comment.
I think this was removed when @mhevery and I were pairing, just because it is not used anywhere. Maybe it should be a separate PR?
| obj.$$protocol = match[1]; | ||
| obj.$$host = match[3]; | ||
| obj.$$port = int(match[5]) || DEFAULT_PORTS[match[1]] || null; | ||
| obj.$$protocol = match.protocol? match.protocol.replace(/:$/,'') : ''; |
There was a problem hiding this comment.
Need to add a space before "?" for consistency.
|
CI is happy: http://ci.angularjs.org/job/angular.js-jeff/47/ |
|
@IgorMinar I updated the documentation annotation in urlUtils.js. |
ghost
assigned 
The location service, and other portions of the application, were relying on a complicated regular expression to get parts of a URL. But there is already a private urlUtils provider, which relies on HTMLAnchorElement to provide this information, and is suitable for most cases. In order to make urlUtils more accessible in the absence of DI, its methods were converted to standalone functions available globally. The urlUtils.resolve method was renamed urlResolve, and was refactored to only take 1 argument, url, and not the 2nd "parse" boolean. The method now always returns a parsed url. All places in code which previously wanted a string instead of a parsed url can now get the value from the href property of the returned object. Tests were also added to ensure IPv6 addresses were handled correctly.
|
@IgorMinar I rebased the branch and made a couple of changes, seen in this commit: jeffbcross@278c342 Changes:
CI build was successful: http://ci.angularjs.org/job/angular.js-jeff/72/ |
|
@IgorMinar I am going to make a small change to the createHttpBackend method to make the implementation similar to what it was before this refactor. |
|
I made a small style change to make the createHttpBackend signature match the pre-refactor signature. This should be ready to review, @IgorMinar . |
jamesdaily
pushed a commit
to jamesdaily/angular.js
that referenced
this pull request
Jan 27, 2014
The location service, and other portions of the application, were relying on a complicated regular expression to get parts of a URL. But there is already a private urlUtils provider, which relies on HTMLAnchorElement to provide this information, and is suitable for most cases. In order to make urlUtils more accessible in the absence of DI, its methods were converted to standalone functions available globally. The urlUtils.resolve method was renamed urlResolve, and was refactored to only take 1 argument, url, and not the 2nd "parse" boolean. The method now always returns a parsed url. All places in code which previously wanted a string instead of a parsed url can now get the value from the href property of the returned object. Tests were also added to ensure IPv6 addresses were handled correctly. Closes angular#3533 Closes angular#2950 Closes angular#3249
jamesdaily
pushed a commit
to jamesdaily/angular.js
that referenced
this pull request
Jan 27, 2014
The location service, and other portions of the application, were relying on a complicated regular expression to get parts of a URL. But there is already a private urlUtils provider, which relies on HTMLAnchorElement to provide this information, and is suitable for most cases. In order to make urlUtils more accessible in the absence of DI, its methods were converted to standalone functions available globally. The urlUtils.resolve method was renamed urlResolve, and was refactored to only take 1 argument, url, and not the 2nd "parse" boolean. The method now always returns a parsed url. All places in code which previously wanted a string instead of a parsed url can now get the value from the href property of the returned object. Tests were also added to ensure IPv6 addresses were handled correctly. Closes angular#3533 Closes angular#2950 Closes angular#3249
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The location service, and other portions of the application, were relying on a complicated regular expression to get parts of a URL. But there is already a private urlUtils provider which relies on HTMLAnchorElement to provide this information, which is suitable for most cases. In order to make urlUtils more accessible in the absence of DI, its methods were converted to standalone functions available globally.
The urlUtils.resolve method was renamed urlResolve, and was refactored to only take 1 argument, url, and not the 2nd "parse" boolean. The method now always returns a parsed url. All places in code which previously wanted a string instead of a parsed url can now get the value from the href property of the returned object.
Tests were also added to ensure IPv6 addresses were handled correctly.
Todo