Author: knopp
Date: Mon Aug 18 12:44:09 2008
New Revision: 686859
URL: http://svn.apache.org/viewvc?rev=686859&view=rev
Log:
WICKET-1788
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=686859&r1=686858&r2=686859&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js Mon
Aug 18 12:44:09 2008
@@ -844,8 +844,9 @@
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 (typeof(Wicket.Focus.lastFocusId) !=
"undefined" && Wicket.Focus.lastFocusId != "" && Wicket.Focus.lastFocusId !=
null)
+
t.setRequestHeader("Wicket-FocusedElementId", Wicket.Focus.lastFocusId);
t.setRequestHeader("Accept", "text/xml");
t.send(null);
return true;
@@ -893,7 +894,8 @@
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 (typeof(Wicket.Focus.lastFocusId) !=
"undefined" && Wicket.Focus.lastFocusId != "" && Wicket.Focus.lastFocusId !=
null)
+
t.setRequestHeader("Wicket-FocusedElementId", Wicket.Focus.lastFocusId);
t.setRequestHeader("Accept", "text/xml");
t.send(body);
return true;