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/issuable_form.js | |
parent | ed194a6d4af3e51246c8cb1927c0e4cc9fea5321 (diff) | |
download | gitlab-ce-941c11824a191216fd43805b910cdbd172157cb0.tar.gz |
Fix Pikaday
Diffstat (limited to 'app/assets/javascripts/issuable_form.js')
-rw-r--r-- | app/assets/javascripts/issuable_form.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index 470c39c6f76..cd2562bc6a9 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -1,12 +1,12 @@ /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new, quotes, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */ /* global GitLab */ /* global Autosave */ -/* global dateFormat */ import Pikaday from 'pikaday'; import UsersSelect from './users_select'; import GfmAutoComplete from './gfm_auto_complete'; import ZenMode from './zen_mode'; +import { parsePikadayDate, pikadayToString } from './lib/utils/datefix'; (function() { this.IssuableForm = (function() { @@ -38,11 +38,13 @@ import ZenMode from './zen_mode'; theme: 'gitlab-theme animate-picker', format: 'yyyy-mm-dd', container: $issuableDueDate.parent().get(0), + parse: dateString => parsePikadayDate(dateString), + toString: date => pikadayToString(date), onSelect: function(dateText) { - $issuableDueDate.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); + $issuableDueDate.val(calendar.toString(dateText)); } }); - calendar.setDate(new Date($issuableDueDate.val())); + calendar.setDate(parsePikadayDate($issuableDueDate.val())); } } |