diff options
author | Paul Martin <paul@paulsputer.com> | 2015-12-09 17:58:15 +0000 |
---|---|---|
committer | Paul Martin <paul@paulsputer.com> | 2015-12-09 18:04:14 +0000 |
commit | 71a347e96308eabee696918cd276380ee30eea9d (patch) | |
tree | 8b4816cfd65e006ecdcabf89fadb3c12daa9fa4b /src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java | |
parent | f7e28a481bcf86070b829e2574b6d5202124bb0a (diff) | |
download | gitblit-71a347e96308eabee696918cd276380ee30eea9d.tar.gz gitblit-71a347e96308eabee696918cd276380ee30eea9d.zip |
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
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java')
-rw-r--r-- | src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java index 6e96526e..dc326654 100644 --- 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;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.markup.html.form.DateTextField;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -42,6 +41,7 @@ import com.gitblit.models.UserModel; import com.gitblit.tickets.TicketMilestone;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.wicket.Html5DateField;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
@@ -106,10 +106,12 @@ public class EditMilestonePage extends RepositoryPage { notificationModel = Model.of(true);
form.add(new TextField<String>("name", nameModel));
- form.add(new DateTextField("due", dueModel, "yyyy-MM-dd"));
+ form.add(new Html5DateField("due", dueModel, "yyyy-MM-dd"));
form.add(new Label("dueFormat", "yyyy-MM-dd"));
form.add(new CheckBox("notify", notificationModel));
-
+ addBottomScriptInline("{var e=document.createElement('input');e.type='date';if(e.type=='date'){$('[name=\"due\"]~.help-inline').hide()}}");
+ addBottomScript("scripts/wicketHtml5Patch.js");
+
List<Status> statusChoices = Arrays.asList(Status.Open, Status.Closed);
form.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));
|