fix for #978 - HTML5 date input support

+ JS patch/hack to coerce legacy wicket into talking to a HTML5 input type
+ JS script to hide inline help on date format when using HTML5 date picker
  + Date picker shown in user locale and standard does not support custom
  format.
  + Always sent in ISO8601 format

diff --git a/src/main/java/com/gitblit/wicket/Html5DateField.java b/src/main/java/com/gitblit/wicket/Html5DateField.java
new file mode 100644 (file)
index 0000000..927ee46
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/Html5DateField.java
@@ -0,0 +1,156 @@
+package com.gitblit.wicket;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converters.DateConverter;
+
+public class Html5DateField extends TextField<Date> implements ITextFormatProvider {
+
+       private static final long serialVersionUID = 1L;
+
+       private static final String DEFAULT_PATTERN = "MM/dd/yyyy";
+
+       private String datePattern = null;
+
+       private IConverter converter = null;
+
+       /**
+        * Creates a new Html5DateField, without a specified pattern. This is the same as calling
+        * <code>new Html5DateField(id, Date.class)</code>
+        * 
+        * @param id
+        *            The id of the date field
+        */
+       public Html5DateField(String id)
+       {
+               this(id, null, defaultDatePattern());
+       }
+
+       /**
+        * Creates a new Html5DateField, without a specified pattern. This is the same as calling
+        * <code>new Html5DateField(id, object, Date.class)</code>
+        * 
+        * @param id
+        *            The id of the date field
+        * @param model
+        *            The model
+        */
+       public Html5DateField(String id, IModel<Date> model)
+       {
+               this(id, model, defaultDatePattern());
+       }
+
+       /**
+        * Creates a new Html5DateField bound with a specific <code>SimpleDateFormat</code> pattern.
+        * 
+        * @param id
+        *            The id of the date field
+        * @param datePattern
+        *            A <code>SimpleDateFormat</code> pattern
+        * 
+        */
+       public Html5DateField(String id, String datePattern)
+       {
+               this(id, null, datePattern);
+       }
+
+       /**
+        * Creates a new DateTextField bound with a specific <code>SimpleDateFormat</code> pattern.
+        * 
+        * @param id
+        *            The id of the date field
+        * @param model
+        *            The model
+        * @param datePattern
+        *            A <code>SimpleDateFormat</code> pattern
+        */
+       public Html5DateField(String id, IModel<Date> model, String datePattern)
+       {
+               super(id, model, Date.class);
+               this.datePattern = datePattern;
+               converter = new DateConverter()
+               {
+                       private static final long serialVersionUID = 1L;
+
+                       /**
+                        * @see org.apache.wicket.util.convert.converters.DateConverter#getDateFormat(java.util.Locale)
+                        */
+                       @Override
+                       public DateFormat getDateFormat(Locale locale)
+                       {
+                               if (locale == null)
+                               {
+                                       locale = Locale.getDefault();
+                               }
+                               return new SimpleDateFormat(Html5DateField.this.datePattern, locale);
+                       }
+               };
+       }
+
+       /**
+        * Returns the default converter if created without pattern; otherwise it returns a
+        * pattern-specific converter.
+        * 
+        * @param type
+        *            The type for which the converter should work
+        * 
+        * @return A pattern-specific converter
+        */
+       @Override
+       public IConverter getConverter(Class<?> type)
+       {
+               if (converter == null)
+               {
+                       return super.getConverter(type);
+               }
+               else
+               {
+                       return converter;
+               }
+       }
+
+       /**
+        * Returns the date pattern.
+        * 
+        * @see org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider#getTextFormat()
+        */
+       public String getTextFormat()
+       {
+               return datePattern;
+       }
+
+       /**
+        * Try to get datePattern from user session locale. If it is not possible, it will return
+        * {@link #DEFAULT_PATTERN}
+        * 
+        * @return date pattern
+        */
+       private static String defaultDatePattern()
+       {
+               Locale locale = Session.get().getLocale();
+               if (locale != null)
+               {
+                       DateFormat format = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+                       if (format instanceof SimpleDateFormat)
+                       {
+                               return ((SimpleDateFormat)format).toPattern();
+                       }
+               }
+               return DEFAULT_PATTERN;
+       }
+       
+       @Override
+       protected String getInputType()
+       {
+               return "date";
+       }
+       
+}
\ No newline at end of file

diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html
index 0897ebee57c4110fbf9017df6810ae496eb7297d..13c263867b7d091112ba1f63defd6210257a9a58 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.html
@@ -19,7 +19,7 @@
                <!-- Edit Milestone Table -->\r
                <table class="ticket">\r
                        <tr><th><wicket:message key="gb.milestone"></wicket:message></th><td class="edit"><input class="input-large" type="text" wicket:id="name" id="name"></input></td></tr>\r
-                       <tr><th><wicket:message key="gb.due"></wicket:message></th><td class="edit"><input class="input-large" type="text" wicket:id="due"></input> &nbsp;<span class="help-inline" wicket:id="dueFormat"></span></td></tr>\r
+                       <tr><th><wicket:message key="gb.due"></wicket:message></th><td class="edit"><input class="input-large" type="date" wicket:id="due"></input> &nbsp;<span class="help-inline" wicket:id="dueFormat"></span></td></tr>\r
                        <tr><th><wicket:message key="gb.status"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="status"></select></td></tr>\r
                        <tr><th></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="notify" /> &nbsp;<span class="help-inline"><wicket:message key="gb.notifyChangedOpenTickets"></wicket:message></span></label></td></tr>\r
                </table>\r

diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
index 6e96526e0bf711a7a8efc22cfc2025ae8aae164d..dc3266543712ec178b09807c68b13ddccfa3eb73 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
@@ -24,7 +24,6 @@ import org.apache.wicket.PageParameters;
 import org.apache.wicket.RestartResponseException;\r
 import org.apache.wicket.ajax.AjaxRequestTarget;\r
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;\r
-import org.apache.wicket.extensions.markup.html.form.DateTextField;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 import org.apache.wicket.markup.html.form.Button;\r
 import org.apache.wicket.markup.html.form.CheckBox;\r
@@ -42,6 +41,7 @@ import com.gitblit.models.UserModel;
 import com.gitblit.tickets.TicketMilestone;\r
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
+import com.gitblit.wicket.Html5DateField;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;\r
 \r
@@ -106,10 +106,12 @@ public class EditMilestonePage extends RepositoryPage {
                notificationModel = Model.of(true);\r
 \r
                form.add(new TextField<String>("name", nameModel));\r
-               form.add(new DateTextField("due", dueModel, "yyyy-MM-dd"));\r
+               form.add(new Html5DateField("due", dueModel, "yyyy-MM-dd"));\r
                form.add(new Label("dueFormat", "yyyy-MM-dd"));\r
                form.add(new CheckBox("notify", notificationModel));\r
-\r
+               addBottomScriptInline("{var e=document.createElement('input');e.type='date';if(e.type=='date'){$('[name=\"due\"]~.help-inline').hide()}}");\r
+               addBottomScript("scripts/wicketHtml5Patch.js");\r
+               \r
                List<Status> statusChoices = Arrays.asList(Status.Open, Status.Closed);\r
                form.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));\r
 \r

diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html
index 2ba5d5ccd2d1e79a9484458e15b718b496b3530c..814aa53028a2a875b6569f6a12a28897ffd81916 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.html
@@ -5,6 +5,7 @@
       lang="en"> \r
 \r
 <wicket:extend>\r
+\r
 <body onload="document.getElementById('name').focus();">\r
        \r
 <div class="container">\r
@@ -19,7 +20,7 @@
                <!-- New Milestone Table -->\r
                <table class="ticket">\r
                        <tr><th><wicket:message key="gb.milestone"></wicket:message></th><td class="edit"><input class="input-large" type="text" wicket:id="name" id="name"></input></td></tr>\r
-                       <tr><th><wicket:message key="gb.due"></wicket:message></th><td class="edit"><input class="input-large" type="text" wicket:id="due"></input> &nbsp;<span class="help-inline" wicket:id="dueFormat"></span></td></tr>\r
+                       <tr><th><wicket:message key="gb.due"></wicket:message></th><td class="edit"><input class="input-large" type="date" wicket:id="due"></input> &nbsp;<span class="help-inline" wicket:id="dueFormat"></span></td></tr>\r
                </table>\r
        </div>\r
        </div>  \r
@@ -32,6 +33,5 @@
        </form>\r
 </div>\r
 </body>\r
-\r
 </wicket:extend>\r
 </html>
\ No newline at end of file

diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
index b452a910f0876ab0c66b774991663fe5799e6480..2250f38a290d2a29ac0c649a4b5c0c3c95bc84bb 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
@@ -21,7 +21,6 @@ import org.apache.wicket.PageParameters;
 import org.apache.wicket.RestartResponseException;\r
 import org.apache.wicket.ajax.AjaxRequestTarget;\r
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;\r
-import org.apache.wicket.extensions.markup.html.form.DateTextField;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 import org.apache.wicket.markup.html.form.Button;\r
 import org.apache.wicket.markup.html.form.Form;\r
@@ -35,6 +34,7 @@ import com.gitblit.tickets.TicketMilestone;
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.utils.TimeUtils;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
+import com.gitblit.wicket.Html5DateField;\r
 import com.gitblit.wicket.WicketUtils;\r
 \r
 /**\r
@@ -78,9 +78,10 @@ public class NewMilestonePage extends RepositoryPage {
                dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY));\r
 \r
                form.add(new TextField<String>("name", nameModel));\r
-               form.add(new DateTextField("due", dueModel, "yyyy-MM-dd"));\r
+               form.add(new Html5DateField("due", dueModel, "yyyy-MM-dd"));\r
                form.add(new Label("dueFormat", "yyyy-MM-dd"));\r
-\r
+               addBottomScriptInline("{var e=document.createElement('input');e.type='date';if(e.type=='date'){$('[name=\"due\"]~.help-inline').hide()}}");\r
+               addBottomScript("scripts/wicketHtml5Patch.js");\r
                form.add(new AjaxButton("create") {\r
 \r
                        private static final long serialVersionUID = 1L;\r

diff --git a/src/main/java/com/gitblit/wicket/pages/scripts/wicketHtml5Patch.js b/src/main/java/com/gitblit/wicket/pages/scripts/wicketHtml5Patch.js
new file mode 100644 (file)
index 0000000..49088e1
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/scripts/wicketHtml5Patch.js
@@ -0,0 +1,13 @@
+//This provides a basic patch/hack to allow Wicket 1.4 to support HTML5 input types
+
+Wicket.Form.serializeInput_original = Wicket.Form.serializeInput;
+
+Wicket.Form.serializeInput = function(input)
+{
+       if (input.type.toLowerCase() == "date")
+       {
+               return Wicket.Form.encode(input.name) + "=" + Wicket.Form.encode(input.value) + "&";
+       }
+       
+       return Wicket.Form.serializeInput_original(input);
+}