Improve eval external script.

kishikawakatsumi · kishikawakatsumi · commit 7c5c4d277392 · 2014-02-04T01:06:18.000+09:00
diff --git a/Classes/JSBScriptingSupport.m b/Classes/JSBScriptingSupport.m
@@ -151,11 +151,9 @@ + (id)require:(NSString *)name
         script = [NSString stringWithContentsOfFile:[name stringByAppendingPathExtension:@"js"] encoding:NSUTF8StringEncoding error:nil];
     }
     if (script) {
-        NSString *closure = [NSString stringWithFormat:
-                             @"(function() {\n"
-                             @"  %@\n"
-                             @"})();\n", script];
-        [globalContext evaluateScript:closure];
+        JSValue *function = globalContext[@"Function"];
+        JSValue *value = [function constructWithArguments:@[script]];
+        [value callWithArguments:nil];
         module = globalContext[@"JSB"][@"exports"];
     }
     

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,9 @@ + (id)require:(NSString *)name`
`151`	`151`	`script = [NSString stringWithContentsOfFile:[name stringByAppendingPathExtension:@"js"] encoding:NSUTF8StringEncoding error:nil];`
`152`	`152`	`}`
`153`	`153`	`if (script) {`
`154`		`- NSString *closure = [NSString stringWithFormat:`
`155`		`- @"(function() {\n"`
`156`		`- @" %@\n"`
`157`		`- @"})();\n", script];`
`158`		`- [globalContext evaluateScript:closure];`
	`154`	`+ JSValue *function = globalContext[@"Function"];`
	`155`	`+ JSValue *value = [function constructWithArguments:@[script]];`
	`156`	`+ [value callWithArguments:nil];`
`159`	`157`	`module = globalContext[@"JSB"][@"exports"];`
`160`	`158`	`}`
`161`	`159`