test/jspx/web/.calendar.jspx.swp
@@ -52,9 +52,9 @@
<delete dir="${package}"/>
</target>
- <target name="test.tomcat5" description="test app"
+ <target name="test.tomcat6" description="test app"
depends="clean, dist">
- <ant antfile="test/jspx/build.xml" target="tomcat5"
+ <ant antfile="test/jspx/build.xml" target="tomcat6"
inheritall="false"/>
</target>
build.xml
@@ -276,7 +276,9 @@ public class SnappyCalendar extends UIComponentBase implements ValueHolder {
w.writeAttribute("class","link");
w.writeAttribute("href", "#");
w.writeAttribute("onclick","sp_calendar.display('" + fieldId + "');return false;");
- w.writeText(sdf.format(getValue()));
+ if(getValue() != null)
+ w.writeText(sdf.format(getValue()));
+
w.endElement("a");
}else{
w.startElement("input");
src/net/sensemaker/snappy/calendar/SnappyCalendar.java
@@ -80,6 +80,7 @@ sp_calendar = {
sp_calendar.render(inputId, date);
},
show:function(inputId, date){
+ if($(inputId).value == '')return;
var id = inputId + sp_calendar.DIV_ID;
var div = $(id);
var slideDown = true;
@@ -249,6 +250,7 @@ sp_calendar = {
var day = format.indexOf("dd");
var year = format.indexOf("yyyy");
var value = $(inputId).value;
+ if(value == '')return;
var seperators = new Array();
var valueA = value.split('');
var i =0;
@@ -296,7 +298,8 @@ sp_calendar = {
return $(inputId + 'format').innerHTML;
},
renderCal:function(target,inputId, date){
- //todo proper cleanup
+ if(date == "")return;
+ //todo proper cleanup
//var SDOW = 1; //Monday
var listeners = sp_calendar.listeners[inputId];
if(listeners != null){
@@ -311,6 +314,7 @@ sp_calendar = {
var settings = sp_calendar.get(inputId);
var SDOW = settings.startDay;
listeners = new Array();
+ if(!target)return;
target.innerHTML = '';
sp_calendar.listeners[inputId] = listeners;
src/net/sensemaker/snappy/resources/basic_cal.js
test/jspx/lib/snappy.jar
@@ -14,6 +14,7 @@ public class Cal {
private Date value = new Date();
private Date valueLink = new Date();
private Date valueLinkLocale = new Date();
+ private Date nullDate;
public Date getValue() {
return value;
@@ -40,6 +41,16 @@ public class Cal {
{
return valueLinkLocale;
}
+
+ public Date getNullDate()
+ {
+ return nullDate;
+ }
+
+ public void setNullDate(Date d)
+ {
+ nullDate = d;
+ }
public void set(){}
}
test/jspx/src/net/sensemaker/snappy/site/Cal.java
@@ -60,6 +60,24 @@
</div>
<div class="infoBox">
+ <div class="head">Null Date</div>
+ <div class="content">
+ <ice:panelGroup>
+
+ Select Date:<snappy:calendar id="nullDate" link="false" autoSubmit="true" value="#{cal.nullDate}" format="MM/dd/yyyy"/>
+ </ice:panelGroup>
+ <br/>
+ <ice:outputText value="Date set to:"/>
+
+ <ice:outputText value="#{cal.nullDate}">
+ <f:convertDateTime pattern="MM/dd/yyyy"/>
+ </ice:outputText>
+
+ </div>
+ </div>
+
+
+ <div class="infoBox">
<div class="head">Localized</div>
<div class="content">
<ice:panelGroup>
test/jspx/web/calendar.jspx
288bafaab458679bf17f0fc0ef660950cad53755
Rob Mayhew
rob.mayhew@gmail.com
http://github.com/robmayhew/snappy-components/commit/aa9834b1d57bf18536f944623f58e11cfe72b156
aa9834b1d57bf18536f944623f58e11cfe72b156
2008-10-18T15:37:28-07:00
2008-10-18T15:37:28-07:00
Added basic handling of null date. Nothing fancy, but it will not throw an error at least.
64a6fac8cd08c67d86b316f2dc0a1ee56d345166
Rob Mayhew
rob.mayhew@gmail.com