2003/09/26 07:19:15

[org.ibex.core.git] / src / org / xwt / Trap.java

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index 196c445..f33f75a 100644 (file)
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -102,8 +102,10 @@ public class Trap {
     }
     
     public void perform(Object val) throws JS.Exn {
-        if (f.getNumFormalArgs()== 0) cascade(val);
-        f.call(new TrapArgs(this, val));
+        if (f.getNumFormalArgs() == 0) cascade(val);
+        TrapArgs ta = new TrapArgs(this, val);
+        Object ret = f.call(ta);
+        if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
     }
     
     public Object cascade() {
@@ -118,11 +120,12 @@ public class Trap {
 
     private static class TrapArgs extends JS.Array {
         private Trap t;
+        public boolean cascadeHappened = false;
         public TrapArgs(Trap t) { this.t = t; }
         public TrapArgs(Trap t, Object value) { this.t = t; addElement(value); }
         
         public void put(Object key, Object val) {
-            if (key.equals("cascade")) t.cascade(val);
+            if (key.equals("cascade")) { cascadeHappened = true; t.cascade(val); }
             else super.put(key, val);
         }