Skip to content

Commit 1ec17a5

Browse files
Merge branch 'master' of https://github.com/surveyjs/widgets
2 parents aee90cb + c26a217 commit 1ec17a5

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/jquery-ui-datepicker.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,15 @@ function init(Survey, $) {
2424
"text"
2525
);
2626
Survey.JsonObject.metaData.addProperty("datepicker", {
27-
name: "dateFormat",
28-
default: "mm/dd/yy",
29-
choices: [
30-
"mm/dd/yy",
31-
"yy-mm-dd",
32-
"d M, y",
33-
"d MM, y",
34-
"DD, d MM, yy",
35-
"'day' d 'of' MM 'in the year' yy"
36-
]
27+
name: "dateFormat"
3728
});
3829
},
3930
afterRender: function(question, el) {
4031
var $el = $(el).is(".widget-datepicker")
4132
? $(el)
4233
: $(el).find(".widget-datepicker");
4334
var pickerWidget = $el.datepicker({
44-
dateFormat: question.dateFormat,
35+
dateFormat: !!question.dateFormat ? question.dateFormat : undefined,
4536
option: {
4637
minDate: null,
4738
maxDate: null

0 commit comments

Comments
 (0)