Przeglądaj źródła

move up `__current__` check in haxe.Template.resolve (closes #5300)

We don't want to do fancy Reflect operations on string or other values because not all targets like that.
Simon Krajewski 9 lat temu
rodzic
commit
6f7a295e11
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      std/haxe/Template.hx

+ 2 - 2
std/haxe/Template.hx

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