BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1b98ee75
Commit
1b98ee75
authored
Jul 18, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds datefix class.
parent
a56ca172
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
due_date_select.js
app/assets/javascripts/due_date_select.js
+4
-4
datefix.js
app/assets/javascripts/lib/utils/datefix.js
+10
-0
No files found.
app/assets/javascripts/due_date_select.js
View file @
1b98ee75
...
...
@@ -2,6 +2,8 @@
/* global dateFormat */
/* global Pikaday */
import
DateFix
from
'./lib/utils/datefix'
class
DueDateSelect
{
constructor
({
$dropdown
,
$loading
}
=
{})
{
const
$dropdownParent
=
$dropdown
.
closest
(
'.dropdown'
);
...
...
@@ -50,7 +52,6 @@ class DueDateSelect {
format
:
'yyyy-mm-dd'
,
onSelect
:
(
dateText
)
=>
{
const
formattedDate
=
dateFormat
(
new
Date
(
dateText
),
'yyyy-mm-dd'
);
$dueDateInput
.
val
(
formattedDate
);
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
.
data
(
'pikaday'
,
calendar
);
}
...
...
@@ -168,7 +169,6 @@ class DueDateSelectors {
initMilestoneDatePicker
()
{
$
(
'.datepicker'
).
each
(
function
()
{
const
$datePicker
=
$
(
this
);
const
[
y
,
m
,
d
]
=
$datePicker
.
val
().
split
(
'-'
);
const
calendar
=
new
Pikaday
({
field
:
$datePicker
.
get
(
0
),
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
);
});
...
...
app/assets/javascripts/lib/utils/datefix.js
0 → 100644
View file @
1b98ee75
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
;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment