svn commit: r562949 - in /tapestry/tapestry4/trunk/tapestry-framework/src: java/org/apache/tapestry/form/ java/org/apache/tapestry/internal/event/impl/ java/org/apache/tapestry/link/ js/tapestry/

[jkuhnert]

Author: jkuhnert
Date: Sun Aug  5 13:15:05 2007
New Revision: 562949

URL: http://svn.apache.org/viewvc?view=rev&rev=562949
Log:
Missing component id in script connectors.

Removed unncessary eval() of form profiles.

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/impl/ComponentEventInvoker.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script?view=diff&rev=562949&r1=562948&r2=562949
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
 Sun Aug  5 13:15:05 2007
@@ -14,8 +14,7 @@
         </unique>
     </body>
     <initialization>
-        tapestry.cleanConnect(dojo.byId("${submit.clientId}"), 
-                              "onclick", "event${key}");
+        tapestry.cleanConnect(dojo.byId("${submit.clientId}"), "onclick", 
"event${key}");
         tapestry.event${key}=function(e){
             dojo.event.browser.stopEvent(e);
             <if expression="parms != null">

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/impl/ComponentEventInvoker.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/impl/ComponentEventInvoker.java?view=diff&rev=562949&r1=562948&r2=562949
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/impl/ComponentEventInvoker.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/internal/event/impl/ComponentEventInvoker.java
 Sun Aug  5 13:15:05 2007
@@ -78,7 +78,7 @@
         String targetId = (String)event.getTarget().get("id");
         String componentId = event.getComponentId();
 
-        if (targetId == null)
+        if (targetId == null || componentId == null)
             return;
 
         List comps = getFormEventListeners(formIdPath);

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script?view=diff&rev=562949&r1=562948&r2=562949
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
 Sun Aug  5 13:15:05 2007
@@ -17,9 +17,9 @@
         tapestry.event${key}=function(e){
             dojo.event.browser.stopEvent(e);
             
-            var content={beventname:"onClick"};
+            var content={beventname:"onClick", bcomponentid:"${component.id}"};
             tapestry.event.buildEventProperties(e, content);
-            if (!content["beventtarget.id"]) 
content["beventtarget.id"]="${component.clientId}";
+            if (!content["beventtarget.id"]) 
{content["beventtarget.id"]="${component.clientId}"};
             
             var url=null;
             if (e["currentTarget"] &amp;&amp; 
e.currentTarget.getAttribute("href")) {

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js?view=diff&rev=562949&r1=562948&r2=562949
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js 
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js Sun Aug 
 5 13:15:05 2007
@@ -180,7 +180,7 @@
                        return;
                }
                
-               this.forms[id].profiles.push(eval(profile));
+               this.forms[id].profiles.push(profile);
        },
 
        /**