antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

fixed a bug in the href/skin code, or actually wrote a quick workaround

Browse source
This commit is contained in:
hns 2001-07-26 15:13:05 +00:00
parent a041b8ec78
commit d7677773c5
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/helma/framework/core/HopExtension.java
View file

@ -985,26 +985,38 @@ public class HopExtension {
String tmpname = arguments.length == 0 ? "" : arguments[0].toString (); String tmpname = arguments.length == 0 ? "" : arguments[0].toString ();
String basicHref =app.getNodeHref (n, tmpname); String basicHref =app.getNodeHref (n, tmpname);
String hrefSkin = app.props.getProperty ("hrefSkin"); String hrefSkin = app.props.getProperty ("hrefSkin");
// FIXME: we should actually walk down the path from the object we called href() on
// instead we move down the URL path.
if (hrefSkin != null) { if (hrefSkin != null) {
// we need to post-process the href with a skin for this application // we need to post-process the href with a skin for this application
// first, look in the object href was called on.
Prototype proto = app.getPrototype (n);
Skin skin = null;
if (proto != null) {
skin = proto.getSkin (hrefSkin);
if (skin != null)
return renderSkin (skin, basicHref, (ESNode) thisObject);
}
for (int i=reval.reqPath.size()-1; i>=0; i--) { for (int i=reval.reqPath.size()-1; i>=0; i--) {
ESNode esn = (ESNode) reval.reqPath.getProperty (i); ESNode esn = (ESNode) reval.reqPath.getProperty (i);
INode sn = esn.getNode (); INode sn = esn.getNode ();
Prototype p = app.getPrototype (sn); proto = app.getPrototype (sn);
if (p != null) { if (proto != null) {
Skin s = p.getSkin (hrefSkin); skin = proto.getSkin (hrefSkin);
if (s != null) { if (skin != null) {
reval.res.pushStringBuffer (); return renderSkin (skin, basicHref, esn);
ESObject param = new ObjectPrototype (null, reval.evaluator);
param.putProperty ("path", new ESString (basicHref), "path".hashCode ());
s.render (reval, esn, param);
return new ESString (reval.res.popStringBuffer ());
} }
} }
} }
} }
return new ESString (basicHref); return new ESString (basicHref);
}
private ESString renderSkin (Skin skin, String path, ESNode obj) throws EcmaScriptException {
reval.res.pushStringBuffer ();
ESObject param = new ObjectPrototype (null, reval.evaluator);
param.putProperty ("path", new ESString (path), "path".hashCode ());
skin.render (reval, obj, param);
return new ESString (reval.res.popStringBuffer ());
} }
} }