X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=1b2d9b69922b8b2e1feab379fad8bbecd68f359f;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=209ae25ec5fbdb1b9a9dc6108d14a0a43b4c6143;hpb=6b010667b40641fdb82925e56466f847f721ef1f;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 209ae25..1b2d9b6 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -97,7 +97,7 @@ public class Template {
         if (staticscript == null) return staticScope;
         JS.CompiledFunction temp = staticscript;
         staticscript = null;
-        temp.call(new JS.Array(), staticScope);
+        new JS.Thread(temp, staticScope).resume();
         return staticScope;
     }
     
@@ -117,19 +117,19 @@ public class Template {
             t.apply(b, callback, xwt);
         }
 
-        PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis);
+        PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis, staticScope);
         for (int i=0; children != null && i<children.size(); i++) {
             Box kid = new Box();
             ((Template)children.elementAt(i)).apply(kid, callback, xwt, pis);
             b.put(b.numChildren(), kid);
         }
 
-        if (script != null) script.call(new JS.Array(), pis);
+        if (script != null) new JS.Thread(script, pis).resume();
 
         for(int i=0; keys != null && i<keys.length; i++)
             if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.put(keys[i], pis.get(vals[i]));
-            else if (keys[i].equals("image")) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
-            else b.put(keys[i], vals[i]);
+            else if ("image".equals(keys[i])) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
+            else if (keys[i] != null) b.put(keys[i], vals[i]);
     }
 
 
@@ -337,31 +337,28 @@ public class Template {
     private static class PerInstantiationScope extends JS.Scope {
         XWT xwt = null;
         PerInstantiationScope parentBoxPis = null;
+        JS.Scope myStatic = null;
         void putDollar(String key, Box target) {
             if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
             declare("$" + key);
             put("$" + key, target);
         }
-        public PerInstantiationScope(Scope parentScope, XWT xwt, PerInstantiationScope parentBoxPis) {
+        public PerInstantiationScope(Scope parentScope, XWT xwt, PerInstantiationScope parentBoxPis, JS.Scope myStatic) {
             super(parentScope);
             this.parentBoxPis = parentBoxPis;
             this.xwt = xwt;
+            this.myStatic = myStatic;
         }
         public boolean isTransparent() { return true; }
-        public boolean has(Object key) { return false; }
-        public void declare(String s) { super.declare(s); }
         public Object get(Object key) {
-            if (key.equals("xwt")) return xwt;
-            if (Box.SpecialBoxProperty.specialBoxProperties.get(key.toString()) != null) return getParentScope().get(key);
             if (super.has(key)) return super.get(key);
-            Object ret = xwt.rr.get(key);
-            if (ret != null) return ret;
-            throw new JS.Exn("must declare " + key + " before using it!");
+            if (key.equals("xwt")) return xwt;
+            if (key.equals("static")) return myStatic;
+            return super.get(key);
         }
         public void put(Object key, Object val) {
-            if (Box.SpecialBoxProperty.specialBoxProperties.get(key.toString()) != null) getParentScope().put(key, val);
-            else if (super.has(key)) super.put(key, val);
-            else throw new JS.Exn("must declare " + key + " before using it!");
+            if (super.has(key)) super.put(key, val);
+            super.put(key, val);
         }
     }