commit 133b009b16169cbcd5ed1d6944baeb02afe7aabd
author Nicolas Lalevee <hibou@apache.org> Mon Jun 22 14:16:42 2009 +0000
committer Nicolas Lalevee <hibou@apache.org> Mon Jun 22 14:16:42 2009 +0000
tree 47c4a795f1ade04d396808a1143991760dd41786
parent d3d33adc90a669b41dfc1e2d5e6ed619c6986b65

Make the global configuration loaded correctly via json


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/site/xooki@787240 13f79535-47bb-0310-9956-ffa450edef68

xooki.js

diff --git a/xooki.js b/xooki.js
index 8668ae1..9553616 100644
--- a/xooki.js
+++ b/xooki.js
@@ -940,8 +940,10 @@
     xooki.c.initProperty("localRoot", xooki.c.root);

     xooki.c.initProperty("localRelativeRoot", xooki.c.relativeRoot);

     globalConfig = xooki.url.loadURL(u("config.json"), false);

-    if (globalConfig != null) 

+    if (globalConfig != null) {

+        globalConfig = eval('('+globalConfig+')');

         xooki.util.mix(globalConfig, xooki.c, false);

+    }

     xooki.url.evalURL(u("config.js"), false);

     xooki.url.evalURL(u("config.extra.js"), false);