diff options
| author | Phil Hughes <me@iamphill.com> | 2017-02-14 21:45:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-02-14 21:49:18 +0000 |
| commit | d4f7f70f1e7c0b8481d33176fd0886a79022217a (patch) | |
| tree | 7b83ebd3682c9b5468d14d8fb127b1953b41a8af | |
| parent | b4c00ae43dda8e32061539f3177a4294a706efc9 (diff) | |
| download | gitlab-ce-no-more-moment.tar.gz | |
Stop Pikaday using momentno-more-moment
| -rw-r--r-- | app/assets/javascripts/due_date_select.js.es6 | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/issuable_form.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/member_expiration_date.js.es6 | 3 | ||||
| -rw-r--r-- | app/views/profiles/personal_access_tokens/index.html.haml | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
5 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/due_date_select.js.es6 b/app/assets/javascripts/due_date_select.js.es6 index ab5ce23d261..9169fcd7328 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,6 +63,7 @@ } }); + calendar.setDate(new Date($dueDateInput.val())); this.$datePicker.append(calendar.el); this.$datePicker.data('pikaday', calendar); } @@ -169,11 +170,12 @@ 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 2ec545db665..c7c744ef61f 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -40,11 +40,12 @@ 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 f57d4a20498..efe7c78a8ec 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,6 +30,7 @@ }, }); + calendar.setDate(new Date($input.val())); $input.data('pikaday', calendar); }); diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index 2c006e1712d..b10f5fc08e2 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -91,7 +91,7 @@ new Pikaday({ field: $dateField.get(0), theme: 'gitlab-theme', - format: 'YYYY-MM-DD', + format: 'yyyy-mm-dd', minDate: new Date(), onSelect: function(dateText) { $dateField.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); diff --git a/config/webpack.config.js b/config/webpack.config.js index 5d5e4bb570a..07023bdee51 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -83,6 +83,7 @@ var config = { new CompressionPlugin({ asset: '[path].gz[query]', }), + new webpack.IgnorePlugin(/moment/, /pikaday/), ], resolve: { |