You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/12/17 14:03:54 UTC
[3/3] incubator-freemarker-docgen git commit: Empty olink-s with no
nested link text now show the target URL in the output.
Empty olink-s with no nested link text now show the target URL in the output.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/79f08970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/79f08970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/79f08970
Branch: refs/heads/master
Commit: 79f08970eddd1d8e9cddd1e57c675f4840f061a4
Parents: fa19f42
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 17 14:02:01 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 17 14:02:01 2015 +0100
----------------------------------------------------------------------
src/main/org/freemarker/docgen/templates/node-handlers.ftlh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/79f08970/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/templates/node-handlers.ftlh b/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
index 65391da..892423e 100644
--- a/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
+++ b/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
@@ -213,7 +213,8 @@
+ .node.@targetdoc?jsString
+ "\". Ensure this target is defined in the docgen.cfg file.">
</#if>
- <a href="${olinks[.node.@targetdoc]}"><#recurse></a><#t>
+ <#local url = olinks[.node.@targetdoc]>
+ <a href="${url}"><#if .node?children?size != 0><#recurse><#else>${url}</#if></a><#t>
</#macro>
<#macro orderedlist>