|
|
@@ -307,28 +307,31 @@ ${ utils.submit_popup_event() }
|
|
|
$(this).parents(".controls").find("input[type='text']").val(moment().format("YYYY-MM-DD[T]HH:mm[Z]"));
|
|
|
});
|
|
|
|
|
|
- $(document).on("click", ".calendar-link", function(){
|
|
|
+ $(document).on("click", ".calendar-link", function () {
|
|
|
var DATE_FORMAT = "YYYY-MM-DD";
|
|
|
var _el = $(this).parents(".controls").find("input[type='text']");
|
|
|
_el.off("keyup");
|
|
|
- _el.on("keyup", function(){
|
|
|
+ _el.on("keyup", function () {
|
|
|
_el.data("lastValue", _el.val());
|
|
|
});
|
|
|
_el.data("lastValue", _el.val());
|
|
|
_el.datepicker({
|
|
|
format: DATE_FORMAT.toLowerCase()
|
|
|
- }).on("changeDate", function () {
|
|
|
+ }).on("changeDate", function () {
|
|
|
_el.datepicker("hide");
|
|
|
}).on("hide", function () {
|
|
|
var _val = _el.data("lastValue") ? _el.data("lastValue") : _el.val();
|
|
|
- if (_val.indexOf("T") == -1){
|
|
|
+ if (_val.indexOf("T") == -1) {
|
|
|
_el.val(_el.val() + "T00:00Z");
|
|
|
}
|
|
|
else if (_el.val().indexOf("T") == "-1") {
|
|
|
- _el.val(_el.val() + "T" + _val.split("T")[1]);
|
|
|
+ _el.val(_el.val() + "T" + _val.split("T")[1]);
|
|
|
}
|
|
|
});
|
|
|
- _el.datepicker('show');
|
|
|
+ _el.datepicker('show');
|
|
|
+ huePubSub.subscribeOnce('hide.datepicker', function () {
|
|
|
+ _el.datepicker('hide');
|
|
|
+ });
|
|
|
});
|
|
|
|
|
|
huePubSub.subscribe('submit.popup.return', function (data) {
|