|
@@ -112,12 +112,14 @@ class Template {
|
|
|
}
|
|
|
|
|
|
function resolve( v : String ) : Dynamic {
|
|
|
- var value = Reflect.field(context, v);
|
|
|
+ var value = Reflect.getProperty(context, v);
|
|
|
if( value != null || Reflect.hasField(context,v) )
|
|
|
return value;
|
|
|
- for( ctx in stack )
|
|
|
- if( Reflect.hasField(ctx,v) )
|
|
|
- return Reflect.field(ctx,v);
|
|
|
+ for( ctx in stack ) {
|
|
|
+ var v = Reflect.getProperty(ctx,v);
|
|
|
+ if( v != null || Reflect.hasField(ctx,v) )
|
|
|
+ return v;
|
|
|
+ }
|
|
|
if( v == "__current__" )
|
|
|
return context;
|
|
|
return Reflect.field(globals,v);
|