added ability to drill down context using plat-context on elements th…

…at aren't controls
Platypi · Jun 4, 2015 · ae226b6 · ae226b6
1 parent 939d514
commit ae226b6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/dependency/injector/injector.ts b/src/dependency/injector/injector.ts
@@ -694,7 +694,7 @@ module plat.dependency {
  * @access public
  * @static
  * 
- * @type {plat.dependency.InjectorObject<plat.dependency.Injector<any>>}
+ * @type {plat.dependency.InjectorObject<any>}
  * 
  * @description
  * An {@link plat.dependency.InjectorObject|InjectorObject} of objects. Contains all the registered 
@@ -709,7 +709,7 @@ module plat.dependency {
  * @access public
  * @static
  * 
- * @type {plat.dependency.InjectorObject<plat.dependency.Injector<any>>}
+ * @type {plat.dependency.InjectorObject<any>}
  * 
  * @description
  * An {@link plat.dependency.InjectorObject|InjectorObject} of static objects. Contains all the registered 

diff --git a/src/processing/nodemanager/elementmanager.ts b/src/processing/nodemanager/elementmanager.ts
@@ -381,7 +381,20 @@ module plat.processing {
  manager: ElementManager = ElementManager.getInstance();
 
  elementMap.element = <HTMLElement>element;
- elementMap.uiControlNode = uiControlNode;
+
+ if (!hasUiControl && isString(elementMap.childContext)) {
+ injector = injectableInjectors[__TemplateControlInstance];
+ hasUiControl = true;
+ elementMap.uiControlNode = {
+ control: <ui.TemplateControl>injector.inject(),
+ resourceElement: null,
+ nodeName: __TemplateContext,
+ expressions: [],
+ injector: injector
+ };
+ } else {
+ elementMap.uiControlNode = uiControlNode;
+ }
 
  manager.initialize(elementMap, parent);
 

diff --git a/src/references/references.ts b/src/references/references.ts
@@ -131,6 +131,7 @@ var __prefix = '$',
  __ViewControl = __Plat + 'viewcontrol',
  __Resources = __Plat + 'resources',
  __Context = __Plat + __CONTEXT,
+ __TemplateContext = __Template + '-' + __CONTEXT,
  __Callback = __Plat + 'callback',
  __AttributePrefix = 'data-',
 

diff --git a/src/register/register.ts b/src/register/register.ts
@@ -1,9 +1,9 @@
 var controlInjectors: plat.dependency.InjectorObject<plat.Control> = {},
  viewControlInjectors: plat.dependency.InjectorObject<plat.ui.ViewControl> = {},
  instanceInjectorDependencies: plat.IObject<plat.IObject<string>> = {},
- injectableInjectors: plat.dependency.InjectorObject<plat.dependency.Injector<any>> = {},
- unregisteredInjectors: plat.dependency.InjectorObject<plat.dependency.Injector<any>> = {},
- staticInjectors: plat.dependency.InjectorObject<plat.dependency.Injector<any>> = {},
+ injectableInjectors: plat.dependency.InjectorObject<any> = {},
+ unregisteredInjectors: plat.dependency.InjectorObject<any> = {},
+ staticInjectors: plat.dependency.InjectorObject<any> = {},
  animationInjectors: plat.dependency.InjectorObject<plat.ui.animations.BaseAnimation> = {},
  jsAnimationInjectors: plat.dependency.InjectorObject<plat.ui.animations.BaseAnimation> = {};