cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(router): simplify regexp

Browse Source 
closes #11373
closes #13329
This commit is contained in:
Victor Berchet 2016-12-08 16:20:04 -08:00
parent 440ef02f29
commit 5c6ec20c7e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,21 +393,23 @@ function pairs<T>(obj: {[key: string]: T}): Pair<string, T>[] {
return res; return res;
} }
const SEGMENT_RE = /^[^\/\(\)\?;=&#]+/; const SEGMENT_RE = /^[^\/()?;=&#]+/;
function matchSegments(str: string): string { function matchSegments(str: string): string {
SEGMENT_RE.lastIndex = 0; SEGMENT_RE.lastIndex = 0;
const match = str.match(SEGMENT_RE); const match = str.match(SEGMENT_RE);
return match ? match[0] : ''; return match ? match[0] : '';
} }
const QUERY_PARAM_RE = /^[^=\?&#]+/; const QUERY_PARAM_RE = /^[^=?&#]+/;
// Return the name of the query param at the start of the string or an empty string
function matchQueryParams(str: string): string { function matchQueryParams(str: string): string {
QUERY_PARAM_RE.lastIndex = 0; QUERY_PARAM_RE.lastIndex = 0;
const match = str.match(SEGMENT_RE); const match = str.match(SEGMENT_RE);
return match ? match[0] : ''; return match ? match[0] : '';
} }
const QUERY_PARAM_VALUE_RE = /^[^\?&#]+/; const QUERY_PARAM_VALUE_RE = /^[^?&#]+/;
// Return the value of the query param at the start of the string or an empty string
function matchUrlQueryParamValue(str: string): string { function matchUrlQueryParamValue(str: string): string {
QUERY_PARAM_VALUE_RE.lastIndex = 0; QUERY_PARAM_VALUE_RE.lastIndex = 0;
const match = str.match(QUERY_PARAM_VALUE_RE); const match = str.match(QUERY_PARAM_VALUE_RE);