Author: jcompagner
Date: Sun Dec 16 08:49:08 2007
New Revision: 604649
URL: http://svn.apache.org/viewvc?rev=604649&view=rev
Log:
WICKET-1098
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=604649&r1=604648&r2=604649&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
Sun Dec 16 08:49:08 2007
@@ -160,11 +160,22 @@
{
MultiLineLabel label = new MultiLineLabel(componentId, model);
label.setOutputMarkupId(true);
- label.add(new LabelAjaxBehavior("onclick"));
+ label.add(new LabelAjaxBehavior(getLabelAjaxEvent()));
return label;
}
/**
+ * By default this returns "onclick" uses can overwrite this on which
event the label behavior
+ * should be triggered
+ *
+ * @return The event name
+ */
+ protected String getLabelAjaxEvent()
+ {
+ return "onclick";
+ }
+
+ /**
* @see
org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newEditor(org.apache.wicket.MarkupContainer,
* java.lang.String, org.apache.wicket.model.IModel)
*/
@@ -191,10 +202,10 @@
{
super.onComponentTag(tag);
final String saveCall = "{wicketAjaxGet('" +
getCallbackUrl() +
-
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
+
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl() +
- "&save=false'); return false;}";
+ "&save=false'); return false;}";
tag.put("onchange", saveCall);
}
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=604649&r1=604648&r2=604649&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Sun Dec 16 08:49:08 2007
@@ -337,9 +337,21 @@
}
};
label.setOutputMarkupId(true);
- label.add(new LabelAjaxBehavior("onclick"));
+ label.add(new LabelAjaxBehavior(getLabelAjaxEvent()));
return label;
}
+
+ /**
+ * By default this returns "onclick" uses can overwrite this on which
event the label behavior
+ * should be triggered
+ *
+ * @return The event name
+ */
+ protected String getLabelAjaxEvent()
+ {
+ return "onclick";
+ }
+
/**
* Gets the editor component.
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=604649&r1=604648&r2=604649&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Sun Dec 16 08:49:08 2007
@@ -90,11 +90,22 @@
}
};
label.setOutputMarkupId(true);
- label.add(new LabelAjaxBehavior("onclick"));
+ label.add(new LabelAjaxBehavior(getLabelAjaxEvent()));
return label;
}
/**
+ * By default this returns "onclick" uses can overwrite this on which
event the label behavior
+ * should be triggered
+ *
+ * @return The event name
+ */
+ protected String getLabelAjaxEvent()
+ {
+ return "onclick";
+ }
+
+ /**
* @see
org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel#newEditor(org.apache.wicket.MarkupContainer,
* java.lang.String, org.apache.wicket.model.IModel)
*/
@@ -132,13 +143,13 @@
{
super.onComponentTag(tag);
final String saveCall = "{wicketAjaxGet('" +
getCallbackUrl() +
-
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
+
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl() +
- "&save=false'); return false;}";
+ "&save=false'); return false;}";
final String keypress = "var
kc=wicketKeyCode(event); if (kc==27) " + cancelCall +
- "; ";
+ "; ";
tag.put("onblur", saveCall);
tag.put("onkeypress", keypress);
