You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@ant.apache.org by hi...@apache.org on 2009/06/22 16:16:43 UTC

svn commit: r787240 - /ant/ivy/site/xooki/xooki.js

Author: hibou
Date: Mon Jun 22 14:16:42 2009
New Revision: 787240

URL: http://svn.apache.org/viewvc?rev=787240&view=rev
Log:
Make the global configuration loaded correctly via json

Modified:
    ant/ivy/site/xooki/xooki.js

Modified: ant/ivy/site/xooki/xooki.js
URL: http://svn.apache.org/viewvc/ant/ivy/site/xooki/xooki.js?rev=787240&r1=787239&r2=787240&view=diff
==============================================================================
--- ant/ivy/site/xooki/xooki.js (original)
+++ ant/ivy/site/xooki/xooki.js Mon Jun 22 14:16:42 2009
@@ -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);