You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/11/27 13:59:12 UTC
svn commit: r1206716 - in
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html:
AjaxEditableLabel.java form/upload/progressbar.js
Author: mgrigorov
Date: Sun Nov 27 12:59:12 2011
New Revision: 1206716
URL: http://svn.apache.org/viewvc?rev=1206716&view=rev
Log:
WICKET-4266
AjaxEditableLabel does not work when using CryptoMapper
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js (props changed)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1206716&r1=1206715&r2=1206716&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Sun Nov 27 12:59:12 2011
@@ -97,14 +97,18 @@ public class AjaxEditableLabel<T> extend
protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
+
+ String callbackUrl = getCallbackUrl().toString();
+ char separator = (callbackUrl != null && callbackUrl.indexOf('?') > -1) ? '&' : '?';
+
final String saveCall = "{" +
- generateCallbackScript("Wicket.Ajax.get('" + getCallbackUrl() +
- "&save=true&'+this.name+'='+Wicket.Form.encode(this.value)") +
- "; return false;}";
+ generateCallbackScript("Wicket.Ajax.get('" + callbackUrl + separator +
+ "save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}";
+
final String cancelCall = "{" +
- generateCallbackScript("Wicket.Ajax.get('" + getCallbackUrl() + "&save=false'") +
- "; return false;}";
+ generateCallbackScript("Wicket.Ajax.get('" + callbackUrl + separator +
+ "save=false'") + "; return false;}";
final String keypress = "var kc=Wicket.Event.keyCode(event); if (kc==27) " +
Propchange: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 27 12:59:12 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:659248,661657,662360,677853,688992,698612,700502,701879,725634,760368,769440,772653,786424,790850
/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:806204-1055573
-/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:1205846,1205853,1205857,1205860,1205874,1205876,1205900
+/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:1205846,1205853,1205857,1205860,1205874,1205876,1205900,1206223,1206701,1206703,1206715
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760296-760351,760353-760355
/wicket/trunk/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760352