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

Revert "fix(router): fix a problem with router not responding to back button (#30160)" (#30320) 

This reverts commit 3327bd8eab.

PR Close #30320
This commit is contained in:
Jason Aden 2019-05-07 17:02:32 -07:00 committed by Alex Rickabaugh
parent 2a0f497e94
commit 8ced321bb6
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/router/src/router.ts
View File

@ -556,7 +556,6 @@ export class Router {
* way the next navigation will be coming from the current URL in the browser. * way the next navigation will be coming from the current URL in the browser.
*/ */
this.rawUrlTree = t.rawUrl; this.rawUrlTree = t.rawUrl;
this.browserUrlTree = t.urlAfterRedirects;
t.resolve(null); t.resolve(null);
return EMPTY; return EMPTY;
} }

27
packages/router/test/integration.spec.ts
View File

@ -662,33 +662,6 @@ describe('Integration', () => {
expect(location.path()).toEqual('/login'); expect(location.path()).toEqual('/login');
}))); })));
it('should set browserUrlTree with urlUpdateStrategy="eagar" and false `shouldProcessUrl`',
fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
const fixture = TestBed.createComponent(RootCmp);
advance(fixture);
router.urlUpdateStrategy = 'eager';
router.resetConfig([
{path: 'team/:id', component: SimpleCmp},
{path: 'login', component: AbsoluteSimpleLinkCmp}
]);
router.navigateByUrl('/team/22');
advance(fixture, 1);
expect((router as any).browserUrlTree.toString()).toBe('/team/22');
// Force to not process URL changes
router.urlHandlingStrategy.shouldProcessUrl = (url: UrlTree) => false;
router.navigateByUrl('/login');
advance(fixture, 1);
// Because we now can't process any URL, we will end up back at the root.
expect((router as any).browserUrlTree.toString()).toBe('/');
})));
it('should eagerly update URL after redirects are applied with urlUpdateStrategy="eagar"', it('should eagerly update URL after redirects are applied with urlUpdateStrategy="eagar"',
fakeAsync(inject([Router, Location], (router: Router, location: Location) => { fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
const fixture = TestBed.createComponent(RootCmp); const fixture = TestBed.createComponent(RootCmp);