Move JS function into .inc.js

jsbuiltin.go

@@ -63,21 +63,7 @@ func IsNaN(value interface{}) bool {
 	return js.Global.Call("isNaN", value).Bool()
 }
 
-var typeOfFunc *js.Object
-
-func initTypeOf() {
-	typeOfFunc = js.Global.Call("eval", `(function() {
-			return function (x) {
-				return typeof x
-			}
-		})()
-	`)
-}
-
 // TypeOf returns the JavaScript type of the passed value
 func TypeOf(value interface{}) string {
-	if typeOfFunc == nil {
-		initTypeOf()
-	}
-	return typeOfFunc.Invoke(value).String()
+	return js.Global.Get("$jsbuiltin$").Call("typeoffunc", value).String()
 }

jsbuiltin.inc.js

@@ -0,0 +1,3 @@
+$global.$jsbuiltin$ = {
+    typeoffunc: function(x) { return typeof x },
+}

jsbuiltin_test.go

@@ -139,6 +139,16 @@ func TestIsNaN(t *testing.T) {
 	}
 }
 
+// This is a hack to initialize the jsbuiltin object, until issue 306 is resolved
+// See https://github.com/gopherjs/gopherjs/issues/306
+func init() {
+	js.Global.Call("eval", `
+		GLOBAL.$jsbuiltin$ = {
+			typeoffunc: function(x) { return typeof x },
+		}`)
+}
+
+
 func TestTypeOf(t *testing.T) {
 	data := map[interface{}]string{
 		// Standard JS types
@@ -169,5 +179,4 @@ func TestTypeOf(t *testing.T) {
 	if to := TypeOf(js.Object{}); to != "object" {
 		t.Fatal("Invalid/empty JS object not recognized as object")
 	}
-
 }