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/09/02 02:13:31 UTC
svn commit: r571908 - in
/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar:
DatePicker.js assets/wicket-calendar.css wicket-date.js
Author: knopp
Date: Sat Sep 1 17:13:30 2007
New Revision: 571908
URL: http://svn.apache.org/viewvc?rev=571908&view=rev
Log:
WICKET-879
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js?rev=571908&r1=571907&r2=571908&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js Sat Sep 1 17:13:30 2007
@@ -24,7 +24,7 @@
checkWicketDate(name, loaderCallback);
}, 50);
}
-};
+}
wicketYuiLoader.addModule({
name: "wicket-date",
@@ -35,46 +35,30 @@
});
-function check${widgetId}Loader() {
+function check${widgetId}Loader() {
if (!wicketYuiLoader.initializing) {
wicketYuiLoader.initializing = true;
wicketYuiLoader.require("wicket-date");
wicketYuiLoader.insert(function() {
wicketYuiLoader.initializing = false;
+ // init the datepicker
init${widgetId}DpJs();
});
} else {
setTimeout(check${widgetId}Loader, 50);
}
- }
-
-check${widgetId}Loader();
-
-function init${widgetId}DpJs() {
-
- YAHOO.namespace("wicket");
- YAHOO.wicket.${widgetId}DpJs = new YAHOO.widget.Calendar("${widgetId}DpJs","${widgetId}Dp", { ${calendarInit} });
- YAHOO.wicket.${widgetId}DpJs.isVisible = function() { return YAHOO.wicket.${widgetId}DpJs.oDomContainer.style.display == 'block'; }
- if (${enableMonthYearSelection}) Wicket.DateTime.enableMonthYearSelection(YAHOO.wicket.${widgetId}DpJs);
-
- function showCalendar() {
- Wicket.DateTime.showCalendar(YAHOO.wicket.${widgetId}DpJs, YAHOO.util.Dom.get("${componentId}").value, '${datePattern}');
- if (${alignWithIcon}) Wicket.DateTime.positionRelativeTo(YAHOO.wicket.${widgetId}DpJs.oDomContainer, "${widgetId}Icon");
- if (${enableMonthYearSelection}) Wicket.DateTime.enableMonthYearSelection(YAHOO.wicket.${widgetId}DpJs);
- }
-
- YAHOO.util.Event.addListener("${widgetId}Icon", "click", showCalendar, YAHOO.wicket.${widgetId}DpJs, true);
-
- function selectHandler(type, args, cal) {
- YAHOO.util.Dom.get("${componentId}").value = Wicket.DateTime.substituteDate('${datePattern}', args[0][0]);
- var wasVisible = YAHOO.wicket.${widgetId}DpJs.isVisible();
- cal.hide();
- if (${fireChangeEvent} && wasVisible) {
- var field = YAHOO.util.Dom.get("${componentId}");
- if (typeof(field.onchange) != 'undefined') field.onchange();
- }
- }
+}
- YAHOO.wicket.${widgetId}DpJs.selectEvent.subscribe(selectHandler,YAHOO.wicket.${widgetId}DpJs);
- YAHOO.wicket.${widgetId}DpJs.render();
+init${widgetId}DpJs = function() {
+ Wicket.DateTime.init( {
+ widgetId: "${widgetId}",
+ componentId: "${componentId}",
+ calendarInit: { ${calendarInit} },
+ datePattern: "${datePattern}",
+ alignWithIcon: ${alignWithIcon},
+ enableMonthYearSelection: ${enableMonthYearSelection},
+ fireChangeEvent: ${fireChangeEvent}
+ });
}
+
+check${widgetId}Loader();
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css?rev=571908&r1=571907&r2=571908&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css Sat Sep 1 17:13:30 2007
@@ -30,7 +30,7 @@
float: right;
}
-.yui-calendar input {
+.yui-calendar .calheader input {
text-align: center;
border: 1px solid #999;
vertical-align: middle;
@@ -45,10 +45,10 @@
display: block;
}
-.yui-calendar a.yearDown {
+.yui-calendar .calheader a.yearDown {
background: url(../../assets/skins/sam/sprite.png) no-repeat 0 -400px;
}
-.yui-calendar a.yearUp {
+.yui-calendar .calheader a.yearUp {
background: url(../../assets/skins/sam/sprite.png) no-repeat 0 -350px;
}
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js?rev=571908&r1=571907&r2=571908&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js Sat Sep 1 17:13:30 2007
@@ -57,7 +57,7 @@
year = year * 1 + 1900;
}
}
- date = new Date();
+ var date = new Date();
date.setFullYear(year, (month - 1), day);
return date;
}
@@ -164,12 +164,10 @@
};
E.on(yearUpId, "click", function() {
- var field = YAHOO.util.Dom.get(yearInputId);
processNumber(1);
});
E.on(yearDownId, "click", function() {
- var field = YAHOO.util.Dom.get(yearInputId);
processNumber(-1);
});
}
@@ -191,11 +189,43 @@
selectHtml += "</select>";
// generate year input and spinner buttons
- selectHtml += "<table class='yearInputContainer'>";
+ selectHtml += "<table>";
selectHtml += "<tr><td><a class='yearDown' id='" + yearDownId + "'/></td>";
selectHtml += "<td><input type='text' size='4' id='" + yearInputId + "'/></td>";
selectHtml += "<td><a class='yearUp' id='" + yearUpId + "'/></td>";
selectHtml += "</tr></table>";
return selectHtml;
}
+}
+
+// configures a datepicker using the cfg object
+Wicket.DateTime.init = function(cfg) {
+ cfg.dpJs = cfg.widgetId + "DpJs";
+ cfg.dp = cfg.widgetId + "Dp";
+ cfg.icon = cfg.widgetId +"Icon";
+ YAHOO.namespace("wicket");
+ YAHOO.wicket[cfg.dpJs] = new YAHOO.widget.Calendar(cfg.dpJs,cfg.dp, cfg.calendarInit);
+ YAHOO.wicket[cfg.dpJs].isVisible = function() { return YAHOO.wicket[cfg.dpJs].oDomContainer.style.display == 'block'; }
+ if (cfg.enableMonthYearSelection) Wicket.DateTime.enableMonthYearSelection(YAHOO.wicket[cfg.dpJs]);
+
+ function showCalendar() {
+ Wicket.DateTime.showCalendar(YAHOO.wicket[cfg.dpJs], YAHOO.util.Dom.get(cfg.componentId).value, cfg.datePattern);
+ if (cfg.alignWithIcon) Wicket.DateTime.positionRelativeTo(YAHOO.wicket[cfg.dpJs].oDomContainer, cfg.icon);
+ if (cfg.enableMonthYearSelection) Wicket.DateTime.enableMonthYearSelection(YAHOO.wicket[cfg.dpJs]);
+ }
+
+ YAHOO.util.Event.addListener(cfg.icon, "click", showCalendar, YAHOO.wicket[cfg.dpJs], true);
+
+ function selectHandler(type, args, cal) {
+ YAHOO.util.Dom.get(cfg.componentId).value = Wicket.DateTime.substituteDate(cfg.datePattern, args[0][0]);
+ var wasVisible = YAHOO.wicket[cfg.dpJs].isVisible();
+ cal.hide();
+ if (cfg.fireChangeEvent && wasVisible) {
+ var field = YAHOO.util.Dom.get(cfg.componentId);
+ if (typeof(field.onchange) != 'undefined') field.onchange();
+ }
+ }
+
+ YAHOO.wicket[cfg.dpJs].selectEvent.subscribe(selectHandler,YAHOO.wicket[cfg.dpJs]);
+ YAHOO.wicket[cfg.dpJs].render();
}