changed code generation for target attribute in xlink tags, in an attempt to
fix a HTML-generation problem with Electric Minds' "Posts" pages
This commit is contained in:
parent
adca4f5d91
commit
2a0b87bc84
|
@ -33,7 +33,7 @@ public class UtilTargetTag extends VeniceBodyTagSupport
|
||||||
UtilXLinkTag xlink = (UtilXLinkTag)findAncestorWithClass(this,UtilXLinkTag.class);
|
UtilXLinkTag xlink = (UtilXLinkTag)findAncestorWithClass(this,UtilXLinkTag.class);
|
||||||
if (xlink!=null)
|
if (xlink!=null)
|
||||||
{ // set the link data
|
{ // set the link data
|
||||||
xlink.setTarget(getBodyContent().getString().trim());
|
xlink.setTarget2(getBodyContent().getString().trim());
|
||||||
return SKIP_BODY;
|
return SKIP_BODY;
|
||||||
|
|
||||||
} // end if
|
} // end if
|
||||||
|
|
|
@ -45,6 +45,7 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
|
||||||
private String target = null;
|
private String target = null;
|
||||||
private String text = null;
|
private String text = null;
|
||||||
private String title = null;
|
private String title = null;
|
||||||
|
private boolean target_external = false;
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------------
|
/*--------------------------------------------------------------------------------
|
||||||
* Overrides from class BodyTagSupport
|
* Overrides from class BodyTagSupport
|
||||||
|
@ -105,6 +106,9 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
|
||||||
type = -1;
|
type = -1;
|
||||||
text = null;
|
text = null;
|
||||||
title = null;
|
title = null;
|
||||||
|
if (target_external)
|
||||||
|
target = null;
|
||||||
|
target_external = false;
|
||||||
return EVAL_PAGE;
|
return EVAL_PAGE;
|
||||||
|
|
||||||
} // end doEndTag
|
} // end doEndTag
|
||||||
|
@ -158,4 +162,15 @@ public class UtilXLinkTag extends VeniceBodyTagSupport
|
||||||
|
|
||||||
} // end setTitle
|
} // end setTitle
|
||||||
|
|
||||||
|
final void setTarget2(String s)
|
||||||
|
{
|
||||||
|
if (target==null)
|
||||||
|
{ // set target via external tag
|
||||||
|
target = s;
|
||||||
|
target_external = true;
|
||||||
|
|
||||||
|
} // end if
|
||||||
|
|
||||||
|
} // end setTarget2
|
||||||
|
|
||||||
} // end class UtilXLinkTag
|
} // end class UtilXLinkTag
|
||||||
|
|
Loading…
Reference in New Issue
Block a user