Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/@angular/router/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ export class Router {
resolvePromise(false);
}
},
(e: any) => {
(e: any) => {
if (e instanceof NavigationCancelingError) {
this.navigated = true;
this.routerEvents.next(
Expand Down
4 changes: 2 additions & 2 deletions scripts/windows/create-symlinks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd `dirname $0`
while read RAW_PACKAGE
do
PACKAGE=${RAW_PACKAGE: : -1}
DESTDIR=./../../modules/\@angular/${PACKAGE}/src
DESTDIR=./../../modules/\@angular/${PACKAGE}
mv ${DESTDIR}/facade ${DESTDIR}/facade.old
cmd <<< "mklink \"..\\..\\modules\\\@angular\\"${PACKAGE}"\\src\\facade\" \"..\\..\\facade\\src\\\""
cmd <<< "mklink \"..\\..\\modules\\\@angular\\"${PACKAGE}"\\facade\" \"..\\..\\facade\\src\\\""
done < packages.txt
21 changes: 13 additions & 8 deletions scripts/windows/packages.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
common
compiler
core
forms
http
platform-browser
platform-browser-dynamic
platform-server
common/src
compiler/src
compiler/testing
core/src
core/testing
forms/src
http/src
platform-browser/src
platform-browser/testing
platform-browser-dynamic/src
platform-server/src
platform-webworker/src
platform-webworker-dynamic/src
2 changes: 1 addition & 1 deletion scripts/windows/remove-symlinks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd `dirname $0`
while read RAW_PACKAGE
do
PACKAGE=${RAW_PACKAGE: : -1}
DESTDIR=./../../modules/\@angular/${PACKAGE}/src
DESTDIR=./../../modules/\@angular/${PACKAGE}
rm ${DESTDIR}/facade
mv ${DESTDIR}/facade.old ${DESTDIR}/facade
done < packages.txt