fix($location): parse query string when path is empty in hashbang mode #5977
Conversation
|
LGTM |
| @@ -178,6 +178,11 @@ function LocationHashbangUrl(appBase, hashPrefix) { | |||
| throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url, | |||
| hashPrefix); | |||
| } | |||
|
|
|||
| if (!withoutHashUrl.length && withoutBaseUrl.charAt(0) === '?') { | |||
There was a problem hiding this comment.
BTW, why !withoutHashUrl.length rather than withoutHashUrl === ''? Is this because you want to match null too?
There was a problem hiding this comment.
it's guaranteed to not be null because of the condition above, so it's just a style thing. whatever is preferred works for me
|
If nobody has any comments about my question re: the weird absolute url in the tests, this is probably okay |
| @@ -1487,6 +1487,30 @@ describe('$location', function() { | |||
| expect(location.url()).toBe('/not-starting-with-slash'); | |||
| expect(location.absUrl()).toBe('http://server/pre/index.html#/not-starting-with-slash'); | |||
| }); | |||
|
|
|||
| describe("search()", function() { | |||
| it("should not return an empty object when url has search query and path is empty", function() { | |||
There was a problem hiding this comment.
can you reword this so that we are describing what it should do rather than what it shouldn't do?
Before this fix, search queries in hashbang mode were ignored if the hash was not present in the url. This patch corrects this by ensuring that the search query is available to be parsed by urlResolve when the hashbang is not present. Closes angular#5964
|
|
||
| this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; | ||
| this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : ''); | ||
| if (this.$$url) { | ||
| url = this.$$path ? hashPrefix + this.$$url : this.$$url; |
There was a problem hiding this comment.
This fixes the weird looking absUrl()... once the change to the way path() works is merged, this would need to be updated to test that path !== '/'
|
lgtm |
|
Closed by cad717b |
Before this fix, search queries in hashbang mode were ignored if the hash was not present in the url. This patch corrects this by ensuring that the search query is available to be parsed by urlResolve when the hashbang is not present.
Closes #5964