Author: jcompagner
Date: Wed Jun 25 06:47:24 2008
New Revision: 671549

URL: http://svn.apache.org/viewvc?rev=671549&view=rev
Log:
IE7 will complain about illegal argument exception when focusId is not set

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=671549&r1=671548&r2=671549&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
 Wed Jun 25 06:47:24 2008
@@ -844,8 +844,11 @@
                                t.open("GET", url, this.async);
                                t.onreadystatechange = 
this.stateChangeCallback.bind(this);
                                // set a special flag to allow server 
distinguish between ajax and non-ajax requests
-                               t.setRequestHeader("Wicket-Ajax", "true");      
                        
-                               t.setRequestHeader("Wicket-FocusedElementId", 
Wicket.Focus.lastFocusId || "");
+                               t.setRequestHeader("Wicket-Ajax", "true");
+                               if (Wicket.Focus.lastFocusId)
+                               {                       
+                                       
t.setRequestHeader("Wicket-FocusedElementId", Wicket.Focus.lastFocusId);
+                               }
                                t.setRequestHeader("Accept", "text/xml");
                                t.send(null);
                                return true;
@@ -893,7 +896,10 @@
                                t.setRequestHeader("Content-Type", 
"application/x-www-form-urlencoded");
                                // set a special flag to allow server 
distinguish between ajax and non-ajax requests
                                t.setRequestHeader("Wicket-Ajax", "true");
-                               t.setRequestHeader("Wicket-FocusedElementId", 
Wicket.Focus.lastFocusId || "");
+                               if (Wicket.Focus.lastFocusId)
+                               {
+                                       
t.setRequestHeader("Wicket-FocusedElementId", Wicket.Focus.lastFocusId);
+                               }
                                t.setRequestHeader("Accept", "text/xml");
                                t.send(body);
                                return true;


Reply via email to