diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-30 13:56:04 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-02-06 09:38:53 +0000 |
| commit | 12cc9a530c6540075c78239416027eb706fac386 (patch) | |
| tree | f6846d1a9033eb767b19a9236a16ee0d5c7c6eaa /app/assets | |
| parent | 5942247dd6f73f5e92a3c635873e62d0efbf9ea8 (diff) | |
| download | gitlab-ce-12cc9a530c6540075c78239416027eb706fac386.tar.gz | |
Changed date check testremove-jquery-ui-datepicker
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/due_date_select.js.es6 | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/issuable_form.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/member_expiration_date.js.es6 | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0a09f1c7578..ef65875d276 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -34,7 +34,7 @@ require('bootstrap/js/transition'); require('bootstrap/js/tooltip'); require('bootstrap/js/popover'); require('select2/select2.js'); -require('pikaday'); +window.Pikaday = require('pikaday'); window._ = require('underscore'); window.Dropzone = require('dropzone'); require('mousetrap'); diff --git a/app/assets/javascripts/due_date_select.js.es6 b/app/assets/javascripts/due_date_select.js.es6 index b3def37ad66..ab5ce23d261 100644 --- a/app/assets/javascripts/due_date_select.js.es6 +++ b/app/assets/javascripts/due_date_select.js.es6 @@ -48,7 +48,7 @@ const calendar = new Pikaday({ field: $dueDateInput.get(0), theme: 'gitlab-theme', - format: 'yyyy-mm-dd', + format: 'YYYY-MM-DD', onSelect: (dateText) => { const formattedDate = dateFormat(new Date(dateText), 'yyyy-mm-dd'); @@ -63,8 +63,6 @@ } }); - calendar.setDate(new Date($dueDateInput.val())); - this.$datePicker.append(calendar.el); this.$datePicker.data('pikaday', calendar); } @@ -171,12 +169,11 @@ const calendar = new Pikaday({ field: $datePicker.get(0), theme: 'gitlab-theme', - format: 'yyyy-mm-dd', + format: 'YYYY-MM-DD', onSelect(dateText) { $datePicker.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); } }); - calendar.setDate(new Date($datePicker.val())); $datePicker.data('pikaday', calendar); }); diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index c7c744ef61f..2ec545db665 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -40,12 +40,11 @@ calendar = new Pikaday({ field: $issuableDueDate.get(0), theme: 'gitlab-theme', - format: 'yyyy-mm-dd', + format: 'YYYY-MM-DD', onSelect: function(dateText) { $issuableDueDate.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); } }); - calendar.setDate(new Date($issuableDueDate.val())); } } diff --git a/app/assets/javascripts/member_expiration_date.js.es6 b/app/assets/javascripts/member_expiration_date.js.es6 index 8b045dfc134..f57d4a20498 100644 --- a/app/assets/javascripts/member_expiration_date.js.es6 +++ b/app/assets/javascripts/member_expiration_date.js.es6 @@ -19,7 +19,7 @@ const calendar = new Pikaday({ field: $input.get(0), theme: 'gitlab-theme', - format: 'yyyy-mm-dd', + format: 'YYYY-MM-DD', minDate: new Date(), onSelect(dateText) { $input.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); @@ -30,8 +30,6 @@ }, }); - calendar.setDate(new Date($input.val())); - $input.data('pikaday', calendar); }); |