Browse Source

[js] more js.Lib.typeof usage

Dan Korostelev 8 years ago
parent
commit
c6ec577bac
2 changed files with 3 additions and 3 deletions
  1. 1 1
      std/haxe/CallStack.hx
  2. 2 2
      std/haxe/Serializer.hx

+ 1 - 1
std/haxe/CallStack.hx

@@ -326,7 +326,7 @@ class CallStack {
 		#elseif js
 		#elseif js
 			if (s == null) {
 			if (s == null) {
 				return [];
 				return [];
-			} else if ((untyped __js__("typeof"))(s) == "string") {
+			} else if (js.Lib.typeof(s) == "string") {
 				// Return the raw lines in browsers that don't support prepareStackTrace
 				// Return the raw lines in browsers that don't support prepareStackTrace
 				var stack : Array<String> = s.split("\n");
 				var stack : Array<String> = s.split("\n");
 				if( stack[0] == "Error" ) stack.shift();
 				if( stack[0] == "Error" ) stack.shift();

+ 2 - 2
std/haxe/Serializer.hx

@@ -171,12 +171,12 @@ class Serializer {
 
 
 	function serializeRef(v) {
 	function serializeRef(v) {
 		#if js
 		#if js
-		var vt = untyped __js__("typeof")(v);
+		var vt = js.Lib.typeof(v);
 		#end
 		#end
 		for( i in 0...cache.length ) {
 		for( i in 0...cache.length ) {
 			#if js
 			#if js
 			var ci = cache[i];
 			var ci = cache[i];
-			if( untyped __js__("typeof")(ci) == vt && ci == v ) {
+			if( js.Lib.typeof(ci) == vt && ci == v ) {
 			#else
 			#else
 			if( cache[i] == v ) {
 			if( cache[i] == v ) {
 			#end
 			#end