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

Fix DDC errors

This commit is contained in:
Vijay Menon 2016-03-31 16:49:49 -07:00 committed by vsmenon
parent c17dc1c057
commit 529988bc81
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/core/application_ref.ts
View File

@ -250,7 +250,7 @@ export class PlatformRef_ extends PlatformRef {
provide(ApplicationRef, {useFactory: (): ApplicationRef => app, deps: []}) provide(ApplicationRef, {useFactory: (): ApplicationRef => app, deps: []})
]); ]);
var exceptionHandler: Function; var exceptionHandler: ExceptionHandler;
try { try {
injector = this.injector.resolveAndCreateChild(providers); injector = this.injector.resolveAndCreateChild(providers);
exceptionHandler = injector.get(ExceptionHandler); exceptionHandler = injector.get(ExceptionHandler);

4
modules/angular2/src/core/reflection/reflection_capabilities.dart
View File

@ -246,8 +246,8 @@ class ReflectionCapabilities implements PlatformReflectionCapabilities {
List _convertParameter(ParameterMirror p) { List _convertParameter(ParameterMirror p) {
var t = p.type; var t = p.type;
var res = (!t.hasReflectedType || t.reflectedType == dynamic) var res = (!t.hasReflectedType || t.reflectedType == dynamic)
? [] ? <Object>[]
: [t.reflectedType]; : <Object>[t.reflectedType];
res.addAll(p.metadata.map((m) => m.reflectee)); res.addAll(p.metadata.map((m) => m.reflectee));
return res; return res;
} }

4
modules/angular2/src/router/router.ts
View File

@ -338,7 +338,9 @@ export class Router {
return false; return false;
} }
if (isPresent(this._childRouter)) { if (isPresent(this._childRouter)) {
return this._childRouter._routerCanDeactivate(childInstruction); // TODO: ideally, this closure would map to async-await in Dart.
// For now, casting to any to suppress an error.
return <any>this._childRouter._routerCanDeactivate(childInstruction);
} }
return true; return true;
}); });

2
scripts/ci/build_dart_ddc.sh
View File

@ -15,7 +15,7 @@ cd $REPO_ROOT_DIR
DDC_TOTAL_WARNING_CAP="210" DDC_TOTAL_WARNING_CAP="210"
DDC_TOTAL_ERROR_CAP="0" DDC_TOTAL_ERROR_CAP="0"
DDC_DIR=`pwd`/tmp/dev_compiler DDC_DIR=`pwd`/tmp/dev_compiler
DDC_VERSION="0.1.20" DDC_VERSION="0.1.23"
# Get DDC # Get DDC
mkdir -p tmp mkdir -p tmp