Author: ehillenius
Date: Mon Feb 5 13:23:14 2007
New Revision: 503880
URL: http://svn.apache.org/viewvc?view=rev&rev=503880
Log:
added configuration options and open the popup with a close button by default
Modified:
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/AbstractCalendar.java
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/CalendarPopup.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/AbstractCalendar.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/AbstractCalendar.java?view=diff&rev=503880&r1=503879&r2=503880
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/AbstractCalendar.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/AbstractCalendar.java
Mon Feb 5 13:23:14 2007
@@ -16,6 +16,11 @@
*/
package wicket.extensions.yui.calendar;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Map.Entry;
+
import wicket.behavior.HeaderContributor;
import wicket.behavior.StringHeaderContributor;
import wicket.extensions.yui.YuiLib;
@@ -42,7 +47,6 @@
*
* @see CalendarPopup
*/
-// TODO see if configuration of the widget can be made a little bit easier
// TODO provide localization strings (base them on the messages of
// JsDatePicker?)
public abstract class AbstractCalendar extends WebComponent {
@@ -72,11 +76,11 @@
* your page header should look like:
*
* <pre>
- * <script type="text/javascript"
src="yahoo.js"></script>
- * <script type="text/javascript"
src="dom.js"></script>
- * <script type="text/javascript"
src="event.js"></script>
- * <script type="text/javascript"
src="calendar.js"></script>
- * <link rel="stylesheet" type="text/css"
href="calendar.css" />
+ * <script type="text/javascript"
src="yahoo.js"></script>
+ * <script type="text/javascript"
src="dom.js"></script>
+ * <script type="text/javascript"
src="event.js"></script>
+ * <script type="text/javascript"
src="calendar.js"></script>
+ * <link rel="stylesheet" type="text/css"
href="calendar.css" />
* </pre>
*/
public AbstractCalendar(String id, boolean contributeDependencies) {
@@ -104,10 +108,48 @@
b.append("YAHOO.namespace(\"wicket\");\nfunction init");
b.append(javascriptId);
b.append("() {\n");
+
+ // instantiate the calendar object
+ b.append(" ");
+ b.append(javascriptWidgetId);
+ b.append(" = new YAHOO.widget.Calendar(\"");
+ b.append(javascriptId);
+ b.append("\",\"");
+ b.append(markupId);
+
+ Properties p = new Properties();
+ configureWidgetProperties(p);
+ b.append("\", { ");
+ for (Iterator i = p.entrySet().iterator();
i.hasNext();) {
+ Entry entry = (Entry) i.next();
+ b.append(entry.getKey());
+ Object value = entry.getValue();
+ if (value instanceof CharSequence) {
+ b.append(":\"");
+ b.append(value);
+ b.append("\"");
+ } else {
+ b.append(":");
+ b.append(value);
+ }
+ // TODO handle arrays
+ if (i.hasNext()) {
+ b.append(",");
+ }
+ }
+
+ b.append(" });\n");
+
// append the javascript we want for our init
function; call
// this in an overridable method so that
clients can add their
// stuff without needing a big ass API
appendToInit(markupId, javascriptId,
javascriptWidgetId, b);
+
+ // trigger rendering
+ b.append(" ");
+ b.append(javascriptWidgetId);
+ b.append(".render();\n");
+
b.append("}\n");
// register the function for execution when the
page is loaded
b.append("YAHOO.util.Event.addListener(window,
\"load\", init");
@@ -171,14 +213,19 @@
*/
protected void appendToInit(String markupId, String javascriptId,
String javascriptWidgetId, StringBuffer b) {
- b.append(" ");
- b.append(javascriptWidgetId);
- b.append(" = new YAHOO.widget.Calendar(\"");
- b.append(javascriptId);
- b.append("\",\"");
- b.append(markupId);
- b.append("\");\n ");
- b.append(javascriptWidgetId);
- b.append(".render();\n");
+ }
+
+ /**
+ * Gives overriding classes the option of adding (or even changing/
+ * removing) configuration properties for the javascript widget. See <a
+ * href="http://developer.yahoo.com/yui/calendar/";>the widget's
+ * documentation</a> for the available options. If you want to override/
+ * remove properties, you obviously should call
+ * [EMAIL PROTECTED] super#setWidgetProperties(Properties)} first.
+ *
+ * @param widgetProperties
+ * the current widget properties
+ */
+ protected void configureWidgetProperties(Map widgetProperties) {
}
}
Modified:
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/CalendarPopup.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/CalendarPopup.java?view=diff&rev=503880&r1=503879&r2=503880
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/CalendarPopup.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/CalendarPopup.java
Mon Feb 5 13:23:14 2007
@@ -16,6 +16,8 @@
*/
package wicket.extensions.yui.calendar;
+import java.util.Map;
+
import wicket.RequestCycle;
import wicket.ResourceReference;
import wicket.datetime.markup.html.form.DateTextField;
@@ -113,6 +115,7 @@
final Icon icon = new Icon("icon");
add(icon);
+ // The calendar component
final AbstractCalendar calendar = new AbstractCalendar("cal",
contributeDependencies) {
@@ -121,9 +124,6 @@
protected void appendToInit(String markupId, String
javascriptId,
String javascriptWidgetId, StringBuffer
b) {
- super.appendToInit(markupId, javascriptId,
javascriptWidgetId,
- b);
-
// not pretty to look at, but cheaper than
using a template
String iconId = icon.getMarkupId();
// add a listener to the calendar widget that
fills in the value
@@ -151,12 +151,19 @@
b.append(".replace(/y+/, yr);\n
YAHOO.util.Dom.get(\"");
b.append(target.getMarkupId());
b.append("\").value = val;\n");
- b.append(" cal.hide();\n}");
+ b.append(" cal.hide();\n }\n");
b.append(" ");
b.append(javascriptWidgetId);
b.append(".selectEvent.subscribe(selectHandler,
");
b.append(javascriptWidgetId);
- b.append(");");
+ b.append(");\n");
+ }
+
+ protected void configureWidgetProperties(
+ Map widgetProperties) {
+
super.configureWidgetProperties(widgetProperties);
+ // property to display a close button
+ widgetProperties.put("close", Boolean.TRUE);
}
};
add(calendar);
