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

If macro function returns something its appended to the response buffer

Browse source
This commit is contained in:
hns 2001-01-28 21:11:25 +00:00
parent 02482e6469
commit bc420bc2ec
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/helma/framework/core/Skin.java
View file

@ -182,10 +182,10 @@ public class Skin {
arguments[0] = par; arguments[0] = par;
if (handler != null) { if (handler != null) {
// not a macro handled by global - check handler object // not a macro handled by global - need to find handler object
if (handlerNode != null) { if (handlerNode != null) {
// was called with this object - check it or its parents for matching prototype // was called with this object - check it or its parents for matching prototype
if (!handler.equalsIgnoreCase (handlerNode.getPrototypeName ())) { if (!handler.equalsIgnoreCase ("hopobject") && !handler.equalsIgnoreCase (handlerNode.getPrototypeName ())) {
// the handler object is not what we want // the handler object is not what we want
INode n = handlerNode.getNode(); INode n = handlerNode.getNode();
while (n != null) { while (n != null) {
@ -219,7 +219,9 @@ public class Skin {
} }
if (handlerObject != null) { if (handlerObject != null) {
handlerObject.doIndirectCall (reval.evaluator, handlerObject, name+"_macro", arguments); ESValue v = handlerObject.doIndirectCall (reval.evaluator, handlerObject, name+"_macro", arguments);
if (v != ESUndefined.theUndefined && v != ESNull.theNull)
reval.res.write (v);
} else { } else {
String msg = "[HopMacro unhandled: "+handler+"."+name+"]"; String msg = "[HopMacro unhandled: "+handler+"."+name+"]";
reval.res.write (" "+msg+" "); reval.res.write (" "+msg+" ");