From c178ad476e5286b73b037a251d8709d511a6373f Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Thu, 8 Oct 2015 22:44:58 -0700 Subject: [PATCH] fix(typings): fix typings which were previously unchecked Closes #4625 --- modules/angular2/src/core/directives/ng_class.ts | 4 ++-- modules/angular2/src/core/linker/element_injector.ts | 6 ++++-- modules/benchpress/src/metric/multi_metric.ts | 2 +- modules/benchpress/src/metric/perflog_metric.ts | 2 +- modules/benchpress/src/statistic.ts | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/angular2/src/core/directives/ng_class.ts b/modules/angular2/src/core/directives/ng_class.ts index 1276ac47f7..98feb34868 100644 --- a/modules/angular2/src/core/directives/ng_class.ts +++ b/modules/angular2/src/core/directives/ng_class.ts @@ -108,12 +108,12 @@ export class NgClass implements DoCheck, OnDestroy { this._initialClasses.forEach(className => this._toggleClass(className, !isCleanup)); } - private _applyClasses(rawClassVal, isCleanup: boolean) { + private _applyClasses(rawClassVal: string[] | {[key: string]: string}, isCleanup: boolean) { if (isPresent(rawClassVal)) { if (isListLikeIterable(rawClassVal)) { (rawClassVal).forEach(className => this._toggleClass(className, !isCleanup)); } else { - StringMapWrapper.forEach(rawClassVal, (expVal, className) => { + StringMapWrapper.forEach(<{[k: string]: string}>rawClassVal, (expVal, className) => { if (expVal) this._toggleClass(className, !isCleanup); }); } diff --git a/modules/angular2/src/core/linker/element_injector.ts b/modules/angular2/src/core/linker/element_injector.ts index 4b18d99961..8a77887812 100644 --- a/modules/angular2/src/core/linker/element_injector.ts +++ b/modules/angular2/src/core/linker/element_injector.ts @@ -212,13 +212,15 @@ function _createProtoQueryRefs(bindings: BindingWithVisibility[]): ProtoQueryRef var res = []; ListWrapper.forEachWithIndex(bindings, (b, i) => { if (b.binding instanceof DirectiveBinding) { + var directiveBinding = b.binding; // field queries - var queries: QueryMetadataWithSetter[] = b.binding.queries; + var queries: QueryMetadataWithSetter[] = directiveBinding.queries; queries.forEach(q => res.push(new ProtoQueryRef(i, q.setter, q.metadata))); // queries passed into the constructor. // TODO: remove this after constructor queries are no longer supported - var deps: DirectiveDependency[] = b.binding.resolvedFactories[0].dependencies; + var deps: DirectiveDependency[] = + directiveBinding.resolvedFactory.dependencies; deps.forEach(d => { if (isPresent(d.queryDecorator)) res.push(new ProtoQueryRef(i, null, d.queryDecorator)); }); diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/benchpress/src/metric/multi_metric.ts index 0986afe0e1..d2012135f2 100644 --- a/modules/benchpress/src/metric/multi_metric.ts +++ b/modules/benchpress/src/metric/multi_metric.ts @@ -42,7 +42,7 @@ export class MultiMetric extends Metric { } } -function mergeStringMaps(maps: any[]): Object { +function mergeStringMaps(maps: { [key: string]: string }[]): Object { var result = {}; maps.forEach( map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); }); diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/benchpress/src/metric/perflog_metric.ts index 45fe407aea..608b01f8ce 100644 --- a/modules/benchpress/src/metric/perflog_metric.ts +++ b/modules/benchpress/src/metric/perflog_metric.ts @@ -142,7 +142,7 @@ export class PerflogMetric extends Metric { }); } - _addEvents(events: any[]) { + _addEvents(events: { [key: string]: string }[]) { var needSort = false; events.forEach(event => { if (StringWrapper.equals(event['ph'], 'X')) { diff --git a/modules/benchpress/src/statistic.ts b/modules/benchpress/src/statistic.ts index f9f79dc53c..10245e1ba5 100644 --- a/modules/benchpress/src/statistic.ts +++ b/modules/benchpress/src/statistic.ts @@ -5,14 +5,14 @@ export class Statistic { return Statistic.calculateStandardDeviation(sample, mean) / mean * 100; } - static calculateMean(samples: any[]) { + static calculateMean(samples: number[]) { var total = 0; // TODO: use reduce samples.forEach(x => total += x); return total / samples.length; } - static calculateStandardDeviation(samples: any[], mean) { + static calculateStandardDeviation(samples: number[], mean) { var deviation = 0; // TODO: use reduce samples.forEach(x => deviation += Math.pow(x - mean, 2));