You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2007/06/11 14:04:22 UTC

svn commit: r546112 - in /incubator/wicket/trunk/jdk-1.4: wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js

Author: knopp
Date: Mon Jun 11 05:04:21 2007
New Revision: 546112

URL: http://svn.apache.org/viewvc?view=rev&rev=546112
Log:
WICKET-394 - do not serialize choices and select in palette.

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js

Modified: incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?view=diff&rev=546112&r1=546111&r2=546112
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java Mon Jun 11 05:04:21 2007
@@ -24,6 +24,7 @@
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.apache.wicket.util.string.JavascriptUtils;
 import org.apache.wicket.util.value.IValueMap;
 
 
@@ -74,6 +75,12 @@
 			String value = getConverter(displayClass).convertToString(displayValue, getLocale());
 			value = getLocalizer().getString(id + "." + value, this, value);
 
+			// a peace of javascript to avoid to serialize this during ajax serialization
+			buffer.append(JavascriptUtils.SCRIPT_OPEN_TAG  +
+						  "if (typeof(Wicket) != \"undefined\" && typeof(Wicket.Form) != \"undefined\")" +
+			  			  "    Wicket.Form.excludeFromAjaxSerialization." + this.getMarkupId() + "='true';" +
+						  JavascriptUtils.SCRIPT_CLOSE_TAG);
+			
 			buffer.append("\n<option value=\"").append(id).append("\">").append(value).append(
 					"</option>");
 

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?view=diff&rev=546112&r1=546111&r2=546112
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js Mon Jun 11 05:04:21 2007
@@ -305,8 +305,16 @@
     }
 }
 
+//list of item to exclude from serialization
+Wicket.Form.excludeFromAjaxSerialization = {};
+
 // Returns url/post-body fragment representing element (e) 
 Wicket.Form.serializeElement = function(e) {
+
+	if (Wicket.Form.excludeFromAjaxSerialization && e.id && Wicket.Form.excludeFromAjaxSerialization[e.id] == "true") {
+		return "";
+	}
+
     var tag = e.tagName.toLowerCase();
     if (tag == "select") {
         return Wicket.Form.serializeSelect(e);