@@ -14,7 +14,7 @@ import 'package:angular/core/module.dart' show Scope, RootScope;
14
14
import 'package:angular/core/annotation.dart' show Visibility, DirectiveBinder;
15
15
import 'package:angular/core_dom/module_internal.dart'
16
16
show Animate, View, ViewFactory, BoundViewFactory, ViewPort, NodeAttrs, ElementProbe,
17
- NgElement, ContentPort, TemplateLoader, ShadowRootEventHandler, EventHandler ;
17
+ NgElement, ContentPort, TemplateLoader, ShadowRootBoundary, ShadowBoundary ;
18
18
19
19
var _TAG_GET = new UserTag ('DirectiveInjector.get()' );
20
20
var _TAG_INSTANTIATE = new UserTag ('DirectiveInjector.instantiate()' );
@@ -49,7 +49,7 @@ const int ELEMENT_PROBE_KEY_ID = 13;
49
49
const int TEMPLATE_LOADER_KEY_ID = 14 ;
50
50
const int SHADOW_ROOT_KEY_ID = 15 ;
51
51
const int CONTENT_PORT_KEY_ID = 16 ;
52
- const int EVENT_HANDLER_KEY_ID = 17 ;
52
+ const int SHADOW_BOUNDARY_KEY_ID = 17 ;
53
53
const int KEEP_ME_LAST = 18 ;
54
54
55
55
class DirectiveInjector implements DirectiveBinder {
@@ -72,7 +72,7 @@ class DirectiveInjector implements DirectiveBinder {
72
72
TEMPLATE_LOADER_KEY .uid = TEMPLATE_LOADER_KEY_ID ;
73
73
SHADOW_ROOT_KEY .uid = SHADOW_ROOT_KEY_ID ;
74
74
CONTENT_PORT_KEY .uid = CONTENT_PORT_KEY_ID ;
75
- EVENT_HANDLER_KEY .uid = EVENT_HANDLER_KEY_ID ;
75
+ SHADOW_BOUNDARY_KEY .uid = SHADOW_BOUNDARY_KEY_ID ;
76
76
ANIMATE_KEY .uid = ANIMATE_KEY_ID ;
77
77
for (var i = 1 ; i < KEEP_ME_LAST ; i++ ) {
78
78
if (_KEYS [i].uid != i) throw 'MISSORDERED KEYS ARRAY: ${_KEYS } at $i ' ;
@@ -96,7 +96,7 @@ class DirectiveInjector implements DirectiveBinder {
96
96
, TEMPLATE_LOADER_KEY
97
97
, SHADOW_ROOT_KEY
98
98
, CONTENT_PORT_KEY
99
- , EVENT_HANDLER_KEY
99
+ , SHADOW_BOUNDARY_KEY
100
100
, KEEP_ME_LAST
101
101
];
102
102
@@ -105,7 +105,7 @@ class DirectiveInjector implements DirectiveBinder {
105
105
final Node _node;
106
106
final NodeAttrs _nodeAttrs;
107
107
final Animate _animate;
108
- final EventHandler _eventHandler ;
108
+ final ShadowBoundary _shadowBoundary ;
109
109
Scope scope; //TODO(misko): this should be final after we get rid of controller
110
110
111
111
NgElement _ngElement;
@@ -140,15 +140,15 @@ class DirectiveInjector implements DirectiveBinder {
140
140
141
141
static Binding _tempBinding = new Binding ();
142
142
143
- DirectiveInjector (parent, appInjector, this ._node, this ._nodeAttrs, this ._eventHandler ,
143
+ DirectiveInjector (parent, appInjector, this ._node, this ._nodeAttrs, this ._shadowBoundary ,
144
144
this .scope, this ._animate)
145
145
: appInjector = appInjector,
146
146
parent = parent == null ? new DefaultDirectiveInjector (appInjector) : parent;
147
147
148
148
DirectiveInjector ._default (this .parent, this .appInjector)
149
149
: _node = null ,
150
150
_nodeAttrs = null ,
151
- _eventHandler = null ,
151
+ _shadowBoundary = null ,
152
152
scope = null ,
153
153
_animate = null ;
154
154
@@ -264,7 +264,7 @@ class DirectiveInjector implements DirectiveBinder {
264
264
case SCOPE_KEY_ID : return scope;
265
265
case ELEMENT_PROBE_KEY_ID : return elementProbe;
266
266
case NG_ELEMENT_KEY_ID : return ngElement;
267
- case EVENT_HANDLER_KEY_ID : return _eventHandler ;
267
+ case SHADOW_BOUNDARY_KEY_ID : return _shadowBoundary ;
268
268
case CONTENT_PORT_KEY_ID : return parent._getById (keyId);
269
269
default : new NoProviderError (_KEYS [keyId]);
270
270
}
@@ -344,9 +344,9 @@ class TemplateDirectiveInjector extends DirectiveInjector {
344
344
BoundViewFactory _boundViewFactory;
345
345
346
346
TemplateDirectiveInjector (DirectiveInjector parent, Injector appInjector,
347
- Node node, NodeAttrs nodeAttrs, EventHandler eventHandler ,
347
+ Node node, NodeAttrs nodeAttrs, ShadowBoundary shadowBoundary ,
348
348
Scope scope, Animate animate, this ._viewFactory)
349
- : super (parent, appInjector, node, nodeAttrs, eventHandler , scope, animate);
349
+ : super (parent, appInjector, node, nodeAttrs, shadowBoundary , scope, animate);
350
350
351
351
352
352
Object _getById (int keyId) {
@@ -368,9 +368,9 @@ abstract class ComponentDirectiveInjector extends DirectiveInjector {
368
368
final ShadowRoot _shadowRoot;
369
369
370
370
ComponentDirectiveInjector (DirectiveInjector parent, Injector appInjector,
371
- EventHandler eventHandler , Scope scope,
371
+ ShadowBoundary shadowBoundary , Scope scope,
372
372
this ._templateLoader, this ._shadowRoot)
373
- : super (parent, appInjector, parent._node, parent._nodeAttrs, eventHandler , scope,
373
+ : super (parent, appInjector, parent._node, parent._nodeAttrs, shadowBoundary , scope,
374
374
parent._animate);
375
375
376
376
Object _getById (int keyId) {
@@ -389,9 +389,9 @@ class ShadowlessComponentDirectiveInjector extends ComponentDirectiveInjector {
389
389
final ContentPort _contentPort;
390
390
391
391
ShadowlessComponentDirectiveInjector (DirectiveInjector parent, Injector appInjector,
392
- EventHandler eventHandler , Scope scope,
392
+ ShadowBoundary shadowBoundary , Scope scope,
393
393
templateLoader, shadowRoot, this ._contentPort)
394
- : super (parent, appInjector, eventHandler , scope, templateLoader, shadowRoot);
394
+ : super (parent, appInjector, shadowBoundary , scope, templateLoader, shadowRoot);
395
395
396
396
Object _getById (int keyId) {
397
397
switch (keyId) {
@@ -404,7 +404,7 @@ class ShadowlessComponentDirectiveInjector extends ComponentDirectiveInjector {
404
404
class ShadowDomComponentDirectiveInjector extends ComponentDirectiveInjector {
405
405
ShadowDomComponentDirectiveInjector (DirectiveInjector parent, Injector appInjector,
406
406
Scope scope, templateLoader, shadowRoot)
407
- : super (parent, appInjector, new ShadowRootEventHandler (shadowRoot,
407
+ : super (parent, appInjector, new ShadowRootBoundary (shadowRoot,
408
408
parent.getByKey (EXPANDO_KEY ),
409
409
parent.getByKey (EXCEPTION_HANDLER_KEY )),
410
410
scope, templateLoader, shadowRoot);
0 commit comments