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

fix(router): use StringWrapper.startsWith

This commit is contained in:
Brian Ford 2015-09-21 12:05:34 -07:00
parent 43f97a951c
commit 6e0ca7f39a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/angular2/src/router/route_recognizer.ts
View File

@ -52,7 +52,8 @@ export class RouteRecognizer {
if (config instanceof AuxRoute) { if (config instanceof AuxRoute) {
handler = new SyncRouteHandler(config.component, config.data); handler = new SyncRouteHandler(config.component, config.data);
let path = config.path.startsWith('/') ? config.path.substring(1) : config.path; let path =
StringWrapper.startsWith(config.path, '/') ? config.path.substring(1) : config.path;
var recognizer = new PathRecognizer(config.path, handler); var recognizer = new PathRecognizer(config.path, handler);
this.auxRoutes.set(path, recognizer); this.auxRoutes.set(path, recognizer);
return recognizer.terminal; return recognizer.terminal;
@ -140,11 +141,11 @@ export class Redirector {
toSegments: string[] = []; toSegments: string[] = [];
constructor(path: string, redirectTo: string) { constructor(path: string, redirectTo: string) {
if (path.startsWith('/')) { if (StringWrapper.startsWith(path, '/')) {
path = path.substring(1); path = path.substring(1);
} }
this.segments = path.split('/'); this.segments = path.split('/');
if (redirectTo.startsWith('/')) { if (StringWrapper.startsWith(redirectTo, '/')) {
redirectTo = redirectTo.substring(1); redirectTo = redirectTo.substring(1);
} }
this.toSegments = redirectTo.split('/'); this.toSegments = redirectTo.split('/');

12
modules/angular2/src/router/url_parser.ts
View File

@ -1,5 +1,11 @@
import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {isPresent, isBlank, RegExpWrapper, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {
isPresent,
isBlank,
StringWrapper,
RegExpWrapper,
CONST_EXPR
} from 'angular2/src/core/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
/** /**
@ -71,10 +77,10 @@ function matchUrlSegment(str: string): string {
export class UrlParser { export class UrlParser {
private _remaining: string; private _remaining: string;
peekStartsWith(str: string): boolean { return this._remaining.startsWith(str); } peekStartsWith(str: string): boolean { return StringWrapper.startsWith(this._remaining, str); }
capture(str: string): void { capture(str: string): void {
if (!this._remaining.startsWith(str)) { if (!StringWrapper.startsWith(this._remaining, str)) {
throw new BaseException(`Expected "${str}".`); throw new BaseException(`Expected "${str}".`);
} }
this._remaining = this._remaining.substring(str.length); this._remaining = this._remaining.substring(str.length);