summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-07-18 15:03:29 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-07-18 15:03:29 -0400
commitc9ddfab4df80408d595b88a8f1a0c5584c0f39b2 (patch)
treed15393722bc51f4ee49c24284176ccb39d218cda
parent1b98ee75382d5293f3ce4e4f1884a3fc6a057616 (diff)
downloadgitlab-ce-c9ddfab4df80408d595b88a8f1a0c5584c0f39b2.tar.gz
moves the date to the right place
-rw-r--r--app/assets/javascripts/due_date_select.js7
-rw-r--r--app/assets/javascripts/lib/utils/datefix.js1
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js
index 60da9bff06c..5c0455d35f0 100644
--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
@@ -45,7 +45,7 @@ class DueDateSelect {
initDatePicker() {
const $dueDateInput = $(`input[name='${this.fieldName}']`);
-
+ const dateFix = DateFix.dashedFix($dueDateInput.val());
const calendar = new Pikaday({
field: $dueDateInput.get(0),
theme: 'gitlab-theme',
@@ -63,7 +63,7 @@ class DueDateSelect {
}
});
- calendar.setDate(DateFix.dashedFix($dueDateInput.val()));
+ calendar.setDate(dateFix);
this.$datePicker.append(calendar.el);
this.$datePicker.data('pikaday', calendar);
}
@@ -169,6 +169,7 @@ class DueDateSelectors {
initMilestoneDatePicker() {
$('.datepicker').each(function() {
const $datePicker = $(this);
+ const dateFix = DateFix.dashedFix($datePicker.val());
const calendar = new Pikaday({
field: $datePicker.get(0),
theme: 'gitlab-theme animate-picker',
@@ -179,7 +180,7 @@ class DueDateSelectors {
}
});
- calendar.setDate(DateFix.dashedFix($datePicker.val()));
+ calendar.setDate(dateFix);
$datePicker.data('pikaday', calendar);
});
diff --git a/app/assets/javascripts/lib/utils/datefix.js b/app/assets/javascripts/lib/utils/datefix.js
index d0c81ec854f..bdf0f394d1a 100644
--- a/app/assets/javascripts/lib/utils/datefix.js
+++ b/app/assets/javascripts/lib/utils/datefix.js
@@ -1,7 +1,6 @@
const DateFix = {
dashedFix(val) {
const [y, m, d] = val.split('-');
- console.log(y,m,d)
return new Date(y, m - 1, d);
}
}