Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0

designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java

@@ -40,7 +40,7 @@ public class JavaScriptFormatHelper {
             Reader reader = new InputStreamReader(resourceAsStream);
             scriptEngine.eval(reader);
             Invocable invocable = (Invocable) scriptEngine;
-            result = (String) invocable.invokeFunction("js_beautify", jsCode, option.toFormatArgument());
+            result = (String) invocable.invokeFunction("js_beautify_global", jsCode, option.toFormatArgument());
         } catch (ScriptException | NoSuchMethodException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }