committed by
Miško Hevery
parent
4415855683
commit
e916836261
@@ -11,13 +11,7 @@ import {
|
||||
} from 'angular2/test_lib';
|
||||
|
||||
import {DOM} from 'angular2/src/core/dom/dom_adapter';
|
||||
import {
|
||||
List,
|
||||
ListWrapper,
|
||||
Map,
|
||||
MapWrapper,
|
||||
StringMapWrapper
|
||||
} from 'angular2/src/core/facade/collection';
|
||||
import {ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {Type, isBlank, stringify, isPresent, BaseException} from 'angular2/src/core/facade/lang';
|
||||
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
|
||||
|
||||
@@ -296,15 +290,15 @@ function templateRoot(protoViewDto: ProtoViewDto): Element {
|
||||
}
|
||||
|
||||
class MockStepFactory extends CompileStepFactory {
|
||||
steps: List<CompileStep>;
|
||||
subTaskPromises: List<Promise<any>>;
|
||||
steps: CompileStep[];
|
||||
subTaskPromises: Array<Promise<any>>;
|
||||
viewDef: ViewDefinition;
|
||||
|
||||
constructor(steps) {
|
||||
super();
|
||||
this.steps = steps;
|
||||
}
|
||||
createSteps(viewDef): List<CompileStep> {
|
||||
createSteps(viewDef): CompileStep[] {
|
||||
this.viewDef = viewDef;
|
||||
return this.steps;
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ export function main() {
|
||||
return new ViewDefinition({componentId: 'someComponent'});
|
||||
}
|
||||
|
||||
function process(el, propertyBindings = null, directives = null): List<ElementBinderBuilder> {
|
||||
function process(el, propertyBindings = null, directives = null): ElementBinderBuilder[] {
|
||||
var pipeline = createPipeline(propertyBindings, directives);
|
||||
return ListWrapper.map(
|
||||
pipeline.processElements(el, ViewType.COMPONENT, createViewDefinition()),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib';
|
||||
import {ListWrapper, List, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {DOM} from 'angular2/src/core/dom/dom_adapter';
|
||||
import {isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ export function main() {
|
||||
return new ViewDefinition({componentId: 'someComponent'});
|
||||
}
|
||||
|
||||
function process(element, hasNestedProtoView = false): List<ElementBinderBuilder> {
|
||||
function process(element, hasNestedProtoView = false): ElementBinderBuilder[] {
|
||||
return ListWrapper.map(
|
||||
createPipeline(hasNestedProtoView)
|
||||
.processElements(element, ViewType.COMPONENT, createViewDefinition()),
|
||||
|
||||
@@ -2,7 +2,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular
|
||||
import {DOM} from 'angular2/src/core/dom/dom_adapter';
|
||||
import {SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector';
|
||||
import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector';
|
||||
import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
|
||||
export function main() {
|
||||
describe('SelectorMatcher', () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {Inject, Injectable} from 'angular2/di';
|
||||
import {isPresent} from 'angular2/src/core/facade/lang';
|
||||
import {MapWrapper, ListWrapper, List, Map} from 'angular2/src/core/facade/collection';
|
||||
import {MapWrapper, ListWrapper, Map} from 'angular2/src/core/facade/collection';
|
||||
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
|
||||
import {DOM} from 'angular2/src/core/dom/dom_adapter';
|
||||
|
||||
@@ -27,7 +27,7 @@ export class TestRootView {
|
||||
viewRef: RenderViewRef;
|
||||
fragments: RenderFragmentRef[];
|
||||
hostElement: Element;
|
||||
events: List<List<any>>;
|
||||
events: any[][];
|
||||
|
||||
constructor(viewWithFragments: RenderViewWithFragments) {
|
||||
this.viewRef = viewWithFragments.viewRef;
|
||||
@@ -48,9 +48,9 @@ export function elRef(renderView: RenderViewRef, boundElementIndex: number) {
|
||||
export function rootNodes(view: RenderViewRef) {}
|
||||
|
||||
class LoggingEventDispatcher implements RenderEventDispatcher {
|
||||
log: List<List<any>>;
|
||||
log: any[][];
|
||||
|
||||
constructor(log: List<List<any>>) { this.log = log; }
|
||||
constructor(log: any[][]) { this.log = log; }
|
||||
|
||||
dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean {
|
||||
this.log.push([elementIndex, eventName, locals]);
|
||||
@@ -83,7 +83,8 @@ export class DomTestbed {
|
||||
return PromiseWrapper.all(promises);
|
||||
}
|
||||
|
||||
merge(protoViews: List<ProtoViewDto | RenderProtoViewRef>): Promise<RenderProtoViewMergeMapping> {
|
||||
merge(protoViews:
|
||||
Array<ProtoViewDto | RenderProtoViewRef>): Promise<RenderProtoViewMergeMapping> {
|
||||
return this.compiler.mergeProtoViewsRecursively(collectMergeRenderProtoViewsRecurse(
|
||||
<ProtoViewDto>protoViews[0], ListWrapper.slice(protoViews, 1)));
|
||||
}
|
||||
@@ -114,8 +115,8 @@ export class DomTestbed {
|
||||
}
|
||||
|
||||
function collectMergeRenderProtoViewsRecurse(current: ProtoViewDto,
|
||||
components: List<ProtoViewDto | RenderProtoViewRef>):
|
||||
List<RenderProtoViewRef | List<any>> {
|
||||
components: Array<ProtoViewDto | RenderProtoViewRef>):
|
||||
Array<RenderProtoViewRef | any[]> {
|
||||
var result = [current.render];
|
||||
current.elementBinders.forEach((elementBinder) => {
|
||||
if (isPresent(elementBinder.nestedProtoView)) {
|
||||
|
||||
@@ -15,7 +15,7 @@ import {
|
||||
DomEventsPlugin
|
||||
} from 'angular2/src/core/render/dom/events/event_manager';
|
||||
import {NgZone} from 'angular2/src/core/zone/ng_zone';
|
||||
import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {DOM} from 'angular2/src/core/dom/dom_adapter';
|
||||
|
||||
export function main() {
|
||||
@@ -120,10 +120,10 @@ export function main() {
|
||||
}
|
||||
|
||||
class FakeEventManagerPlugin extends EventManagerPlugin {
|
||||
_supports: List<string>;
|
||||
_supports: string[];
|
||||
_nonBubbleEventHandlers: Map<string, Function>;
|
||||
_bubbleEventHandlers: Map<string, Function>;
|
||||
constructor(supports: List<string>) {
|
||||
constructor(supports: string[]) {
|
||||
super();
|
||||
this._supports = supports;
|
||||
this._nonBubbleEventHandlers = new Map();
|
||||
|
||||
Reference in New Issue
Block a user