Merge branch 'master' of https://github.com/openfl/lime

Conflicts:
	js/Boot.hx

js/Boot.hx

@@ -24,8 +24,8 @@ package js;
 private class HaxeError extends js.Error {
 
 	var val:Dynamic;
-	
-	public function new(val:Dynamic) {
+
+	public function new(val:Dynamic) untyped {
 		super();
 		this.val = untyped __define_feature__("js.Boot.HaxeError", val);
 		
@@ -266,12 +266,9 @@ class Boot {
 		return __nativeClassName(o) != null;
 	}
 
-	// resolve native JS class (with window or global):
+	// resolve native JS class in the global scope:
 	static function __resolveNativeClass(name:String) untyped {
-		if (__js__("typeof window") != "undefined")
-			return window[name];
-		else
-			return global[name];
+		return untyped Function('return typeof $name != "undefined" ? $name : null')();
 	}
 
 }