Merge pull request #9 from ccapndave/master

Updating js.Boot.__trace
cloudshift · Jun 1, 2012 · 6883a7c · 6883a7c
2 parents 0864aa5 + 7d24f10
commit 6883a7c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/js/Boot.hx b/js/Boot.hx
@@ -33,23 +33,23 @@ class Boot {
 	private static function __unhtml(s : String) {
 		return s.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
 	}
-
+	
 	private static function __trace(v,i : haxe.PosInfos) {
 		untyped {
 			var msg = if( i != null ) i.fileName+":"+i.lineNumber+": " else "";
 			#if jsfl
 			msg += __string_rec(v,"");
 			fl.trace(msg);
 			#elseif nodejs
-       msg += __string_rec(v,"");
+			msg += __string_rec(v,"");
-      Node.console.log(msg);
+			Node.console.log(msg);
-      #else
+			#else
-			msg += __unhtml(__string_rec(v,""))+"<br/>";
+			msg += __string_rec(v,"");
 			var d = document.getElementById("haxe:trace");
-			if( d == null )
+			if( d != null )
-				alert("No haxe:trace element defined\n"+msg);
+				d.innerHTML += __unhtml(msg)+"<br/>";
-			else
+			else if( __js__("typeof")(console) != "undefined" && console.log != null )
-				d.innerHTML += msg;
+				console.log(msg);
 			#end
 		}
 	}