ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r787691 - /ant/ivy/site/xooki/xooki.js
Date Tue, 23 Jun 2009 14:34:21 GMT
Author: hibou
Date: Tue Jun 23 14:34:20 2009
New Revision: 787691

URL: http://svn.apache.org/viewvc?rev=787691&view=rev
Log:
Fix the reading of the global config (ivy site generation was failing)

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=787691&r1=787690&r2=787691&view=diff
==============================================================================
--- ant/ivy/site/xooki/xooki.js (original)
+++ ant/ivy/site/xooki/xooki.js Tue Jun 23 14:34:20 2009
@@ -940,7 +940,7 @@
     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.length != 0) {
         globalConfig = eval('('+globalConfig+')');
         xooki.util.mix(globalConfig, xooki.c, false);
     }
@@ -1102,7 +1102,7 @@
 	xooki.template = {};
     xooki.template.source = xooki.url.loadURL(xooki.c.action == "print"?cu("printTemplate"):cu("template"));
 	if(xooki.template.source != null) {
-		xooki.template.head = xooki.template.source.match(/<head>([^§]*)<\/head>/im)[1];
+		xooki.template.head = xooki.template.source.match(/<head>([^�]*)<\/head>/im)[1];
 		var root = batchMode?xooki.c.relativeRoot:xooki.c.root;
 		
         var head = xooki.string.processTemplate(xooki.template.head, xooki.config);
@@ -1110,7 +1110,7 @@
 		head = head.replace(/src="([^\\$:"]+)"/g, 'src="'+root+'$1"');
 		xooki.html.addHeader(head);
 
-		var body = xooki.template.source.match(/<body>([^§]*)<\/body>/im)[1];
+		var body = xooki.template.source.match(/<body>([^�]*)<\/body>/im)[1];
 		body = body.replace(/href="([^\\$:"]+)"/g, 'href="'+root+'$1"');
 		xooki.template.body = body.replace(/src="([^\\$:"]+)"/g, 'src="'+root+'$1"');		
 	}



Mime
View raw message