honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): use encodeUri/decodeUri to encode fragment

This commit is contained in:
vsavkin 2016-08-25 06:08:07 -07:00 committed by Victor Berchet
parent 0bb516fae2
commit bb9dfbc578
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/@angular/router/src/url_tree.ts
View File

@ -182,9 +182,8 @@ export class DefaultUrlSerializer implements UrlSerializer {
serialize(tree: UrlTree): string { serialize(tree: UrlTree): string {
const segment = `/${serializeSegment(tree.root, true)}`; const segment = `/${serializeSegment(tree.root, true)}`;
const query = serializeQueryParams(tree.queryParams); const query = serializeQueryParams(tree.queryParams);
const fragment = tree.fragment !== null && tree.fragment !== undefined ? const fragment =
`#${encodeURIComponent(tree.fragment)}` : tree.fragment !== null && tree.fragment !== undefined ? `#${encodeURI(tree.fragment)}` : '';
'';
return `${segment}${query}${fragment}`; return `${segment}${query}${fragment}`;
} }
} }
@ -371,7 +370,7 @@ class UrlParser {
parseFragment(): string { parseFragment(): string {
if (this.peekStartsWith('#')) { if (this.peekStartsWith('#')) {
return decode(this.remaining.substring(1)); return decodeURI(this.remaining.substring(1));
} else { } else {
return null; return null;
} }

4
modules/@angular/router/test/url_serializer.spec.ts
View File

@ -207,10 +207,10 @@ describe('url serializer', () => {
}); });
it('should encode/decode fragment', () => { it('should encode/decode fragment', () => {
const u = `/one#${encode("one two")}`; const u = `/one#${encodeURI("one two=three four")}`;
const tree = url.parse(u); const tree = url.parse(u);
expect(tree.fragment).toEqual('one two'); expect(tree.fragment).toEqual('one two=three four');
expect(url.serialize(tree)).toEqual(u); expect(url.serialize(tree)).toEqual(u);
}); });
}); });