kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Adds datefix class.

Browse source
This commit is contained in:
Jacob Schatz 2017-07-18 13:38:40 -04:00
parent a56ca172a2
commit 1b98ee7538
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/due_date_select.js
View file

@ -2,6 +2,8 @@
/* global dateFormat */ /* global dateFormat */
/* global Pikaday */ /* global Pikaday */
import DateFix from './lib/utils/datefix'
class DueDateSelect { class DueDateSelect {
constructor({ $dropdown, $loading } = {}) { constructor({ $dropdown, $loading } = {}) {
const $dropdownParent = $dropdown.closest('.dropdown'); const $dropdownParent = $dropdown.closest('.dropdown');
@ -50,7 +52,6 @@ class DueDateSelect {
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
onSelect: (dateText) => { onSelect: (dateText) => {
const formattedDate = dateFormat(new Date(dateText), 'yyyy-mm-dd'); const formattedDate = dateFormat(new Date(dateText), 'yyyy-mm-dd');
$dueDateInput.val(formattedDate); $dueDateInput.val(formattedDate);
if (this.$dropdown.hasClass('js-issue-boards-due-date')) { if (this.$dropdown.hasClass('js-issue-boards-due-date')) {
@ -62,7 +63,7 @@ class DueDateSelect {
} }
}); });
calendar.setDate(new Date($dueDateInput.val())); calendar.setDate(DateFix.dashedFix($dueDateInput.val()));
this.$datePicker.append(calendar.el); this.$datePicker.append(calendar.el);
this.$datePicker.data('pikaday', calendar); this.$datePicker.data('pikaday', calendar);
} }
@ -168,7 +169,6 @@ class DueDateSelectors {
initMilestoneDatePicker() { initMilestoneDatePicker() {
$('.datepicker').each(function() { $('.datepicker').each(function() {
const $datePicker = $(this); const $datePicker = $(this);
const [y, m, d] = $datePicker.val().split('-');
const calendar = new Pikaday({ const calendar = new Pikaday({
field: $datePicker.get(0), field: $datePicker.get(0),
theme: 'gitlab-theme animate-picker', theme: 'gitlab-theme animate-picker',
@ -179,7 +179,7 @@ class DueDateSelectors {
} }
}); });
calendar.setDate(new Date(y, m - 1, d)); calendar.setDate(DateFix.dashedFix($datePicker.val()));
$datePicker.data('pikaday', calendar); $datePicker.data('pikaday', calendar);
}); });

9
app/assets/javascripts/lib/utils/datefix.js Normal file
View file

@ -0,0 +1,9 @@
const DateFix = {
dashedFix(val) {
const [y, m, d] = val.split('-');
console.log(y,m,d)
return new Date(y, m - 1, d);
}
}
export default DateFix;