TOBAGO-2036: Replace date-picker implementation with vanillajs-datepicker
* remove "today" value from HTML (no longer needed)
* enhance demo
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
index 35c8254..0b48181 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
@@ -39,8 +39,6 @@
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.text.SimpleDateFormat;
-import java.util.Date;
public class DateRenderer<T extends AbstractUIDate> extends InRenderer<T> {
@@ -58,8 +56,8 @@
super.writeAdditionalAttributes(facesContext, writer, input);
writer.writeAttribute(HtmlAttributes.PATTERN, input.getPattern(), true);
- final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- writer.writeAttribute(CustomAttributes.TODAY, sdf.format(new Date()), true);
+// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+// writer.writeAttribute(CustomAttributes.TODAY, sdf.format(new Date()), true); XXX seem no longer needed
final DateTimeI18n dateTimeI18n = DateTimeI18n.valueOf(facesContext.getViewRoot().getLocale());
writer.writeAttribute(CustomAttributes.I18N, JsonUtils.encode(dateTimeI18n), true);
writer.writeAttribute(CustomAttributes.TODAY_BUTTON, input.isTodayButton());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CustomAttributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CustomAttributes.java
index 5253689..fa33082 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CustomAttributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CustomAttributes.java
@@ -80,10 +80,10 @@
* The mode of the tab switch: client, reloadTab, reloadPage.
*/
SWITCH_TYPE("switch-type"),
- /**
+ /* * XXX seem no longer needed
* The date of today
*/
- TODAY("today"),
+// TODAY("today"),
/**
* Show the button to set the field to today.
*/
diff --git a/tobago-core/src/test/resources/renderer/date/date-label.html b/tobago-core/src/test/resources/renderer/date/date-label.html
index 1c2c3f7..502d32b 100644
--- a/tobago-core/src/test/resources/renderer/date/date-label.html
+++ b/tobago-core/src/test/resources/renderer/date/date-label.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-<tobago-date id='id' class='tobago-label-container tobago-margin-bottom' pattern='dd.MM.yyyy' today='2020-12-10' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}'>
+<tobago-date id='id' class='tobago-label-container tobago-margin-bottom' pattern='dd.MM.yyyy' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}'>
<label for='id::field' class='col-form-label'>Label</label>
<div class='tobago-input-group-outer'>
<div class='input-group'>
diff --git a/tobago-core/src/test/resources/renderer/date/date-today-button.html b/tobago-core/src/test/resources/renderer/date/date-today-button.html
index 57eb5b6..f39ad4b 100644
--- a/tobago-core/src/test/resources/renderer/date/date-today-button.html
+++ b/tobago-core/src/test/resources/renderer/date/date-today-button.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-<tobago-date id='id' class='tobago-label-container tobago-margin-bottom' pattern='dd.MM.yyyy' today='2020-12-10' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}' today-button='today-button'>
+<tobago-date id='id' class='tobago-label-container tobago-margin-bottom' pattern='dd.MM.yyyy' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}' today-button='today-button'>
<label for='id::field' class='col-form-label'>Label</label>
<div class='tobago-input-group-outer'>
<div class='input-group'>
diff --git a/tobago-core/src/test/resources/renderer/date/date.html b/tobago-core/src/test/resources/renderer/date/date.html
index 52e3292..118d84a 100644
--- a/tobago-core/src/test/resources/renderer/date/date.html
+++ b/tobago-core/src/test/resources/renderer/date/date.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-<tobago-date id='id' class='tobago-margin-bottom' pattern='dd.MM.YYYY' today='2020-12-10' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}'>
+<tobago-date id='id' class='tobago-margin-bottom' pattern='dd.MM.YYYY' i18n='{"months":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthsShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"daysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"daysMin":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"firstDay":0,"minDays":1,"today":"Today","cancel":"Cancel","clear":"Clear","week":"Week"}'>
<div class='tobago-input-group-outer'>
<div class='input-group'>
<input type='text' name='id' id='id::field' class='form-control'>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
index 87b886d..d1d234a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
@@ -80,8 +80,8 @@
</tc:form>
</tc:section>
- <tc:section label="Outputfields">
- <p>A date can also be displayed in other components.</p>
+ <tc:section label="Dates in other components">
+ <p>A Java date can also be displayed in other components. Please use an appropriate converter.</p>
<tc:section label="Input">
<demo-highlight language="markup"><tc:in label="Date in Textfield" value="\#{dateController.today}">
<f:convertDateTime pattern="dd.MM.yyyy"/>
