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

Revert "feat(router): add a function set up router sync when used with downgradeModule"

Browse Source 
This reverts commit f5bb99931989357c4a053c93c82b92c2740e7d5e. The commit
does not include proper tests.
This commit is contained in:
Alex Rickabaugh 2017-12-20 09:15:15 -08:00
parent b61e3e9d20
commit e4c53f8529
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/router/upgrade/src/upgrade.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {APP_BOOTSTRAP_LISTENER, ComponentRef, InjectionToken, Injector} from '@angular/core'; import {APP_BOOTSTRAP_LISTENER, ComponentRef, InjectionToken} from '@angular/core';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {UpgradeModule} from '@angular/upgrade/static'; import {UpgradeModule} from '@angular/upgrade/static';
@ -50,7 +50,7 @@ export function locationSyncBootstrapListener(ngUpgrade: UpgradeModule) {
} }
/** /**
* @whatItDoes Sets up a location synchronization using the provided UpgradeModule. * @whatItDoes Sets up a location synchronization.
* *
* History.pushState does not fire onPopState, so the Angular location * History.pushState does not fire onPopState, so the Angular location
* doesn't detect it. The workaround is to attach a location change listener * doesn't detect it. The workaround is to attach a location change listener
@ -64,23 +64,13 @@ export function setUpLocationSync(ngUpgrade: UpgradeModule) {
Remove RouterUpgradeInitializer and call setUpLocationSync after UpgradeModule.bootstrap. Remove RouterUpgradeInitializer and call setUpLocationSync after UpgradeModule.bootstrap.
`); `);
} }
setUpRouterSync(ngUpgrade.injector, ngUpgrade.$injector);
}
/** const router: Router = ngUpgrade.injector.get(Router);
* @whatItDoes Sets up a router synchronization using the Angular and AngularJS injectors.
*
* History.pushState does not fire onPopState, so the Angular location
* doesn't detect it. The workaround is to attach a location change listener
*
* @experimental
*/
export function setUpRouterSync(injector: Injector, $injector: any) {
const router: Router = injector.get(Router);
const url = document.createElement('a'); const url = document.createElement('a');
$injector.get('$rootScope').$on('$locationChangeStart', (_: any, next: string, __: string) => { ngUpgrade.$injector.get('$rootScope')
url.href = next; .$on('$locationChangeStart', (_: any, next: string, __: string) => {
router.navigateByUrl(url.pathname + url.search + url.hash); url.href = next;
}); router.navigateByUrl(url.pathname + url.search + url.hash);
} });
}