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

fix(angular_1_router): ng-link is generating wrong hrefs

Browse Source 
At the moment ng-link is generating html5mode URLs for `href`s.
Instead it should check whether or not html5mode is enabled and create
the `href`s accordingly. The renaming in the `getLink` function is
aligning it to `RouterLink`'s `_updateLink`.

Closes #7423
This commit is contained in:
David Reher
2016-03-04 09:14:27 +01:00
committed by Pete Bacon Darwin
parent 980491b08f
commit 69c1405196
3 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/angular1_router/src/ng_outlet.ts
View File

@ -207,13 +207,13 @@ function ngLinkDirective($rootRouter, $parse) {
return;
}
let instruction = null;
let navigationInstruction = null;
let link = attrs.ngLink || '';
function getLink(params) {
instruction = router.generate(params);
navigationInstruction = router.generate(params);
scope.$watch(function() { return router.isRouteActive(instruction); },
scope.$watch(function() { return router.isRouteActive(navigationInstruction); },
function(active) {
if (active) {
element.addClass('ng-link-active');
@ -222,7 +222,8 @@ function ngLinkDirective($rootRouter, $parse) {
}
});
return './' + angular.stringifyInstruction(instruction);
const navigationHref = navigationInstruction.toLinkUrl();
return $rootRouter._location.prepareExternalUrl(navigationHref);
}
let routeParamsGetter = $parse(link);
@ -236,11 +237,11 @@ function ngLinkDirective($rootRouter, $parse) {
}
element.on('click', event => {
if (event.which !== 1 || !instruction) {
if (event.which !== 1 || !navigationInstruction) {
return;
}
$rootRouter.navigateByInstruction(instruction);
$rootRouter.navigateByInstruction(navigationInstruction);
event.preventDefault();
});
}