You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/07/06 09:07:26 UTC

svn commit: r553801 - in /incubator/ivy/site/xooki: antlib.xml xooki.js

Author: xavier
Date: Fri Jul  6 02:07:25 2007
New Revision: 553801

URL: http://svn.apache.org/viewvc?view=rev&rev=553801
Log:
upgrade xooki version

Modified:
    incubator/ivy/site/xooki/antlib.xml
    incubator/ivy/site/xooki/xooki.js

Modified: incubator/ivy/site/xooki/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/site/xooki/antlib.xml?view=diff&rev=553801&r1=553800&r2=553801
==============================================================================
--- incubator/ivy/site/xooki/antlib.xml (original)
+++ incubator/ivy/site/xooki/antlib.xml Fri Jul  6 02:07:25 2007
@@ -26,7 +26,7 @@
     			var filepath = srcFiles[i].substring(0, srcFiles[i].lastIndexOf(project.getProperty("file.separator"))+1);
                 
                 if (attributes.get("checkuptodate")) {
-                    p = "xooki."+srcFiles[i]+".uptodate";
+                    p = "xooki."+file.getAbsolutePath().replace(' ','_')+".uptodate";
                     upToDate = project.createTask("uptodate");
                     upToDate.setProperty(p);
                     upToDate.setSrcfile(file);

Modified: incubator/ivy/site/xooki/xooki.js
URL: http://svn.apache.org/viewvc/incubator/ivy/site/xooki/xooki.js?view=diff&rev=553801&r1=553800&r2=553801
==============================================================================
--- incubator/ivy/site/xooki/xooki.js (original)
+++ incubator/ivy/site/xooki/xooki.js Fri Jul  6 02:07:25 2007
@@ -702,7 +702,7 @@
                 
                 var title;
                 var url;
-                var titleSuffix = "";
+                var invalid = false;
                 
                 if (typeof xooki.toc.pages[xooki.toc.importRoot + id] != "undefined") {
                	    title = xooki.toc.pages[xooki.toc.importRoot + id].title;
@@ -711,14 +711,23 @@
                	    title = xooki.toc.pages[id].title;
                     url = pu(id);
                	} else {
+                    invalid = true;
                		title = code;
-               		url = u(code);
-                    titleSuffix = '?';
+               		url = u(id);
                	}
                 if (index>0) {
                 	title = code.substring(index+1);
                 }
-                return '<a href="'+url+'">'+title+titleSuffix+'</a>';
+                if (invalid) {
+                    if (batchMode) {
+                        // do not output invalid links as links in batch mode
+                        return title;
+                    } else {
+                        return title+'<a href="'+url+'">?</a>';
+                    }
+                } else {
+                    return '<a href="'+url+'">'+title+'</a>';
+                }
             });
         },