diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-18 11:31:01 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-18 11:31:01 +0000 |
commit | 941c11824a191216fd43805b910cdbd172157cb0 (patch) | |
tree | 14a4dd1c7cbddd117c6fe321925915af7933c444 /app/assets/javascripts/member_expiration_date.js | |
parent | ed194a6d4af3e51246c8cb1927c0e4cc9fea5321 (diff) | |
download | gitlab-ce-941c11824a191216fd43805b910cdbd172157cb0.tar.gz |
Fix Pikaday
Diffstat (limited to 'app/assets/javascripts/member_expiration_date.js')
-rw-r--r-- | app/assets/javascripts/member_expiration_date.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/member_expiration_date.js b/app/assets/javascripts/member_expiration_date.js index 26b24fdafda..84e70e35bad 100644 --- a/app/assets/javascripts/member_expiration_date.js +++ b/app/assets/javascripts/member_expiration_date.js @@ -1,6 +1,5 @@ -/* global dateFormat */ - import Pikaday from 'pikaday'; +import { parsePikadayDate, pikadayToString } from './lib/utils/datefix'; // Add datepickers to all `js-access-expiration-date` elements. If those elements are // children of an element with the `clearable-input` class, and have a sibling @@ -22,8 +21,10 @@ export default function memberExpirationDate(selector = '.js-access-expiration-d format: 'yyyy-mm-dd', minDate: new Date(), container: $input.parent().get(0), + parse: dateString => parsePikadayDate(dateString), + toString: date => pikadayToString(date), onSelect(dateText) { - $input.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); + $input.val(calendar.toString(dateText)); $input.trigger('change'); @@ -31,7 +32,7 @@ export default function memberExpirationDate(selector = '.js-access-expiration-d }, }); - calendar.setDate(new Date($input.val())); + calendar.setDate(parsePikadayDate($input.val())); $input.data('pikaday', calendar); }); |