iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(PropertySetter): use the global reflector

Browse Source
This commit is contained in:
Victor Berchet
2015-03-11 19:57:21 +01:00
parent c67194a3ef
commit 951a808e0e
20 changed files with 75 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/angular2/test/core/compiler/element_injector_spec.js
Vendored
+13 -14
View File
@@ -12,7 +12,6 @@ import {NgElement} from 'angular2/src/core/dom/element';
import {LightDom, SourceLightDom, DestinationLightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom';
import {Directive} from 'angular2/src/core/annotations/annotations';
import {BindingPropagationConfig} from 'angular2/src/core/compiler/binding_propagation_config';
import {reflector} from 'angular2/src/reflection/reflection';
import {DynamicProtoChangeDetector} from 'angular2/change_detection';
@proxy
@@ -131,7 +130,7 @@ export function main() {
if (isBlank(lightDomAppInjector)) lightDomAppInjector = new Injector([]);
var proto = new ProtoElementInjector(null, 0, bindings, isPresent(shadowDomAppInjector));
var inj = proto.instantiate(null, null, reflector);
var inj = proto.instantiate(null, null);
var preBuilt = isPresent(preBuiltObjects) ? preBuiltObjects : defaultPreBuiltObjects;
inj.instantiateDirectives(lightDomAppInjector, shadowDomAppInjector, preBuilt);
@@ -144,12 +143,12 @@ export function main() {
var inj = new Injector([]);
var protoParent = new ProtoElementInjector(null, 0, parentBindings);
var parent = protoParent.instantiate(null, null, reflector);
var parent = protoParent.instantiate(null, null);
parent.instantiateDirectives(inj, null, parentPreBuildObjects);
var protoChild = new ProtoElementInjector(protoParent, 1, childBindings, false, 1);
var child = protoChild.instantiate(parent, null, reflector);
var child = protoChild.instantiate(parent, null);
child.instantiateDirectives(inj, null, defaultPreBuiltObjects);
return child;
@@ -162,11 +161,11 @@ export function main() {
var shadowInj = inj.createChild([]);
var protoParent = new ProtoElementInjector(null, 0, hostBindings, true);
var host = protoParent.instantiate(null, null, reflector);
var host = protoParent.instantiate(null, null);
host.instantiateDirectives(inj, shadowInj, hostPreBuildObjects);
var protoChild = new ProtoElementInjector(protoParent, 0, shadowBindings, false, 1);
var shadow = protoChild.instantiate(null, host, reflector);
var shadow = protoChild.instantiate(null, host);
shadow.instantiateDirectives(shadowInj, null, null);
return shadow;
@@ -199,9 +198,9 @@ export function main() {
var protoChild1 = new ProtoElementInjector(protoParent, 1, []);
var protoChild2 = new ProtoElementInjector(protoParent, 2, []);
var p = protoParent.instantiate(null, null, reflector);
var c1 = protoChild1.instantiate(p, null, reflector);
var c2 = protoChild2.instantiate(p, null, reflector);
var p = protoParent.instantiate(null, null);
var c1 = protoChild1.instantiate(p, null);
var c2 = protoChild2.instantiate(p, null);
expect(humanize(p, [
[p, 'parent'],
@@ -216,8 +215,8 @@ export function main() {
var protoParent = new ProtoElementInjector(null, 0, []);
var protoChild = new ProtoElementInjector(protoParent, 1, [], false, distance);
var p = protoParent.instantiate(null, null, reflector);
var c = protoChild.instantiate(p, null, reflector);
var p = protoParent.instantiate(null, null);
var c = protoChild.instantiate(p, null);
expect(c.directParent()).toEqual(p);
});
@@ -227,8 +226,8 @@ export function main() {
var protoParent = new ProtoElementInjector(null, 0, []);
var protoChild = new ProtoElementInjector(protoParent, 1, [], false, distance);
var p = protoParent.instantiate(null, null, reflector);
var c = protoChild.instantiate(p, null, reflector);
var p = protoParent.instantiate(null, null);
var c = protoChild.instantiate(p, null);
expect(c.directParent()).toEqual(null);
});
@@ -435,7 +434,7 @@ export function main() {
});
it('should return viewContainer', function () {
var viewContainer = new ViewContainer(null, null, null, null, null, null);
var viewContainer = new ViewContainer(null, null, null, null, null);
var inj = injector([], null, null, new PreBuiltObjects(null, null, viewContainer, null, null));
expect(inj.get(ViewContainer)).toEqual(viewContainer);
modules/angular2/test/core/compiler/integration_spec.js
Vendored
+1 -7
View File
@@ -28,8 +28,6 @@ import {If} from 'angular2/src/directives/if';
import {ViewContainer} from 'angular2/src/core/compiler/view_container';
import {reflector} from 'angular2/src/reflection/reflection';
export function main() {
describe('integration tests', function() {
var compiler, tplResolver;
@@ -58,11 +56,7 @@ export function main() {
var view, ctx, cd;
function createView(pv) {
ctx = new MyComp();
view = pv.instantiate(
null,
null,
reflector
);
view = pv.instantiate(null, null);
view.hydrate(new Injector([]), null, ctx);
cd = view.changeDetector;
}
modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js
Vendored
+1 -1
View File
@@ -82,7 +82,7 @@ export function main() {
function instantiateView(protoView) {
evalContext = new Context();
view = protoView.instantiate(null, null, null);
view = protoView.instantiate(null, null);
view.hydrate(new Injector([]), null, evalContext);
changeDetector = view.changeDetector;
}
modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js
Vendored
+1 -3
View File
@@ -32,8 +32,6 @@ import {ViewContainer} from 'angular2/src/core/compiler/view_container';
import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
import {reflector} from 'angular2/src/reflection/reflection';
export function main() {
BrowserDomAdapter.makeCurrent();
describe('integration tests', function() {
@@ -357,7 +355,7 @@ class MyComp {
}
function createView(pv) {
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(new Injector([]), null, {});
return view;
}
modules/angular2/test/core/compiler/shadow_dom_strategy_spec.js
Vendored
+3 -3
View File
@@ -37,7 +37,7 @@ export function main() {
var host = el('<div></div>');
var nodes = el('<div>view</div>');
var pv = new ProtoView(nodes, new DynamicProtoChangeDetector(null), null);
var view = pv.instantiate(null, null, null);
var view = pv.instantiate(null, null);
strategy.attachTemplate(host, view);
var shadowRoot = DOM.getShadowRoot(host);
@@ -83,7 +83,7 @@ export function main() {
var host = el('<div><span>original content</span></div>');
var nodes = el('<div>view</div>');
var pv = new ProtoView(nodes, new DynamicProtoChangeDetector(null), null);
var view = pv.instantiate(null, null, null);
var view = pv.instantiate(null, null);
strategy.attachTemplate(host, view);
var firstChild = DOM.firstChild(host);
@@ -218,7 +218,7 @@ export function main() {
var host = el('<div><span>original content</span></div>');
var nodes = el('<div>view</div>');
var pv = new ProtoView(nodes, new DynamicProtoChangeDetector(null), null);
var view = pv.instantiate(null, null, null);
var view = pv.instantiate(null, null);
strategy.attachTemplate(host, view);
var firstChild = DOM.firstChild(host);
modules/angular2/test/core/compiler/view_container_spec.js
Vendored
+3 -4
View File
@@ -8,7 +8,6 @@ import {Injector} from 'angular2/di';
import {ProtoElementInjector, ElementInjector} from 'angular2/src/core/compiler/element_injector';
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
import {DynamicProtoChangeDetector, ChangeDetector, Lexer, Parser} from 'angular2/change_detection';
import {reflector} from 'angular2/src/reflection/reflection';
function createView(nodes) {
var view = new View(null, nodes, new DynamicProtoChangeDetector(null), MapWrapper.create());
@@ -72,9 +71,9 @@ export function main() {
parentView = createView([dom.childNodes[0]]);
protoView = new ProtoView(el('<div>hi</div>'), new DynamicProtoChangeDetector(null),
new NativeShadowDomStrategy(null));
elementInjector = new ElementInjector(null, null, null, reflector);
elementInjector = new ElementInjector(null, null, null);
viewContainer = new ViewContainer(parentView, insertionElement, protoView, elementInjector,
null, reflector);
null);
customViewWithOneNode = createView([el('<div>single</div>')]);
customViewWithTwoNodes = createView([el('<div>one</div>'), el('<div>two</div>')]);
});
@@ -219,7 +218,7 @@ export function main() {
new DynamicProtoChangeDetector(null), new NativeShadowDomStrategy(null));
pv.bindElement(new ProtoElementInjector(null, 1, [SomeDirective]));
pv.bindTextNode(0, parser.parseBinding('foo', null));
fancyView = pv.instantiate(null, null, reflector);
fancyView = pv.instantiate(null, null);
});
it('hydrating should update rootElementInjectors and parent change detector', () => {
modules/angular2/test/core/compiler/view_spec.js
Vendored
+24 -24
View File
@@ -15,7 +15,7 @@ import {View} from 'angular2/src/core/compiler/view';
import {ViewContainer} from 'angular2/src/core/compiler/view_container';
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
import {EventManager, DomEventsPlugin} from 'angular2/src/core/events/event_manager';
import {Reflector, reflector} from 'angular2/src/reflection/reflection';
import {reflector} from 'angular2/src/reflection/reflection';
@proxy
@IMPLEMENTS(ViewContainer)
@@ -45,7 +45,7 @@ export function main() {
function createView(protoView, eventManager: EventManager = null) {
var ctx = new MyEvaluationContext();
var view = protoView.instantiate(null, eventManager, reflector);
var view = protoView.instantiate(null, eventManager);
view.hydrate(null, null, ctx);
return view;
}
@@ -60,7 +60,7 @@ export function main() {
var view;
beforeEach(() => {
var pv = new ProtoView(el('<div id="1"></div>'), new DynamicProtoChangeDetector(null), null);
view = pv.instantiate(null, null, reflector);
view = pv.instantiate(null, null);
});
it('should be dehydrated by default', () => {
@@ -90,7 +90,7 @@ export function main() {
var fakeView = new FakeView();
pv.returnToPool(fakeView);
expect(pv.instantiate(null, null, reflector)).toBe(fakeView);
expect(pv.instantiate(null, null)).toBe(fakeView);
});
});
@@ -135,7 +135,7 @@ export function main() {
it('should collect the root node in the ProtoView element', () => {
var pv = new ProtoView(templateAwareCreateElement('<div id="1"></div>'),
new DynamicProtoChangeDetector(null), null);
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.nodes.length).toBe(1);
expect(DOM.getAttribute(view.nodes[0], 'id')).toEqual('1');
@@ -149,7 +149,7 @@ export function main() {
pv.bindElement(null);
pv.bindElementProperty(parser.parseBinding('a', null), 'prop', reflector.setter('prop'));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.bindElements.length).toEqual(1);
expect(view.bindElements[0]).toBe(view.nodes[0]);
@@ -161,7 +161,7 @@ export function main() {
pv.bindElement(null);
pv.bindElementProperty(parser.parseBinding('b', null), 'a', reflector.setter('a'));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.bindElements.length).toEqual(1);
expect(view.bindElements[0]).toBe(view.nodes[0].childNodes[1]);
@@ -178,7 +178,7 @@ export function main() {
pv.bindTextNode(0, parser.parseBinding('a', null));
pv.bindTextNode(2, parser.parseBinding('b', null));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.textNodes.length).toEqual(2);
expect(view.textNodes[0]).toBe(view.nodes[0].childNodes[0]);
@@ -191,7 +191,7 @@ export function main() {
pv.bindElement(null);
pv.bindTextNode(0, parser.parseBinding('b', null));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.textNodes.length).toEqual(1);
expect(view.textNodes[0]).toBe(view.nodes[0].childNodes[1].childNodes[0]);
@@ -206,7 +206,7 @@ export function main() {
var pv = new ProtoView(template, new DynamicProtoChangeDetector(null),
new NativeShadowDomStrategy(null));
pv.instantiateInPlace = true;
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.nodes[0]).toBe(template);
});
@@ -215,7 +215,7 @@ export function main() {
var template = el('<div></div>')
var pv = new ProtoView(template, new DynamicProtoChangeDetector(null),
new NativeShadowDomStrategy(null))
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.nodes[0]).not.toBe(template);
});
@@ -235,7 +235,7 @@ export function main() {
new DynamicProtoChangeDetector(null), null);
pv.bindElement(new ProtoElementInjector(null, 1, [SomeDirective]));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.elementInjectors.length).toBe(1);
expect(view.elementInjectors[0].get(SomeDirective) instanceof SomeDirective).toBe(true);
@@ -248,7 +248,7 @@ export function main() {
pv.bindElement(protoParent);
pv.bindElement(new ProtoElementInjector(protoParent, 1, [AnotherDirective]));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.elementInjectors.length).toBe(2);
expect(view.elementInjectors[0].get(SomeDirective) instanceof SomeDirective).toBe(true);
@@ -264,9 +264,9 @@ export function main() {
pv.bindElement(testProtoElementInjector);
var hostProtoInjector = new ProtoElementInjector(null, 0, []);
var hostInjector = hostProtoInjector.instantiate(null, null, reflector);
var hostInjector = hostProtoInjector.instantiate(null, null);
var view;
expect(() => view = pv.instantiate(hostInjector, null, reflector)).not.toThrow();
expect(() => view = pv.instantiate(hostInjector, null)).not.toThrow();
expect(testProtoElementInjector.parentElementInjector).toBe(view.elementInjectors[0]);
expect(testProtoElementInjector.hostElementInjector).toBeNull();
});
@@ -279,8 +279,8 @@ export function main() {
pv.bindElement(testProtoElementInjector);
var hostProtoInjector = new ProtoElementInjector(null, 0, []);
var hostInjector = hostProtoInjector.instantiate(null, null, reflector);
expect(() => pv.instantiate(hostInjector, null, reflector)).not.toThrow();
var hostInjector = hostProtoInjector.instantiate(null, null);
expect(() => pv.instantiate(hostInjector, null)).not.toThrow();
expect(testProtoElementInjector.parentElementInjector).toBeNull();
expect(testProtoElementInjector.hostElementInjector).toBe(hostInjector);
});
@@ -295,7 +295,7 @@ export function main() {
pv.bindElement(protoParent);
pv.bindElement(new ProtoElementInjector(protoParent, 1, [AnotherDirective]));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.rootElementInjectors.length).toBe(1);
expect(view.rootElementInjectors[0].get(SomeDirective) instanceof SomeDirective).toBe(true);
@@ -307,7 +307,7 @@ export function main() {
pv.bindElement(new ProtoElementInjector(null, 1, [SomeDirective]));
pv.bindElement(new ProtoElementInjector(null, 2, [AnotherDirective]));
var view = pv.instantiate(null, null, reflector);
var view = pv.instantiate(null, null);
view.hydrate(null, null, null);
expect(view.rootElementInjectors.length).toBe(2)
expect(view.rootElementInjectors[0].get(SomeDirective) instanceof SomeDirective).toBe(true);
@@ -330,7 +330,7 @@ export function main() {
function createNestedView(protoView) {
ctx = new MyEvaluationContext();
var view = protoView.instantiate(null, null, reflector);
var view = protoView.instantiate(null, null);
view.hydrate(new Injector([]), null, ctx);
return view;
}
@@ -638,7 +638,7 @@ export function main() {
var rootProtoView = ProtoView.createRootProtoView(pv, element,
someComponentDirective, new DynamicProtoChangeDetector(null),
new NativeShadowDomStrategy(null));
var view = rootProtoView.instantiate(null, null, reflector);
var view = rootProtoView.instantiate(null, null);
view.hydrate(new Injector([]), null, null);
expect(view.rootElementInjectors[0].get(SomeComponent)).not.toBe(null);
});
@@ -647,7 +647,7 @@ export function main() {
var rootProtoView = ProtoView.createRootProtoView(pv, element,
someComponentDirective, new DynamicProtoChangeDetector(null),
new NativeShadowDomStrategy(null));
var view = rootProtoView.instantiate(null, null, reflector);
var view = rootProtoView.instantiate(null, null);
view.hydrate(new Injector([]), null, null);
expect(element.shadowRoot.childNodes[0].childNodes[0].nodeValue).toEqual('hi');
});
@@ -753,10 +753,10 @@ class TestProtoElementInjector extends ProtoElementInjector {
super(parent, index, bindings, firstBindingIsComponent);
}
instantiate(parent:ElementInjector, host:ElementInjector, reflector: Reflector):ElementInjector {
instantiate(parent:ElementInjector, host:ElementInjector):ElementInjector {
this.parentElementInjector = parent;
this.hostElementInjector = host;
return super.instantiate(parent, host, reflector);
return super.instantiate(parent, host);
}
}