Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e8b9d0c2
Commit
e8b9d0c2
authored
Nov 11, 2016
by
giulianovarriale
Committed by
Mike Greiling
Jan 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass date as integer params on instantiate new Date in order to avoid time zone inconsistency
parent
313aa339
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
111 additions
and
3 deletions
+111
-3
app/assets/javascripts/due_date_select.js.es6
app/assets/javascripts/due_date_select.js.es6
+8
-3
app/assets/javascripts/lib/utils/datetime_utility.js
app/assets/javascripts/lib/utils/datetime_utility.js
+13
-0
changelogs/unreleased/fix-timezone-due-date-picker.yml
changelogs/unreleased/fix-timezone-due-date-picker.yml
+4
-0
spec/javascripts/datetime_utility_spec.js.es6
spec/javascripts/datetime_utility_spec.js.es6
+32
-0
spec/javascripts/due_date_select_spec.js.es6
spec/javascripts/due_date_select_spec.js.es6
+25
-0
spec/javascripts/fixtures/due_date_select.html.haml
spec/javascripts/fixtures/due_date_select.html.haml
+29
-0
No files found.
app/assets/javascripts/due_date_select.js.es6
View file @
e8b9d0c2
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
(function(global) {
(function(global) {
class DueDateSelect {
class DueDateSelect {
constructor({ $dropdown, $loading } = {}) {
constructor({ $dropdown, $loading
, $context
} = {}) {
const $dropdownParent = $dropdown.closest('.dropdown');
const $dropdownParent = $dropdown.closest('.dropdown');
const $block = $dropdown.closest('.block');
const $block = $dropdown.closest('.block');
this.$context = $context || $('body');
this.$loading = $loading;
this.$loading = $loading;
this.$dropdown = $dropdown;
this.$dropdown = $dropdown;
this.$dropdownParent = $dropdownParent;
this.$dropdownParent = $dropdownParent;
...
@@ -80,9 +81,12 @@
...
@@ -80,9 +81,12 @@
}
}
parseSelectedDate() {
parseSelectedDate() {
this.rawSelectedDate = $("input[name='" + this.fieldName + "']").val();
this.rawSelectedDate = this.$context.find(`input[name='${this.fieldName}']`).val();
if (this.rawSelectedDate.length) {
if (this.rawSelectedDate.length) {
let dateObj = new Date(this.rawSelectedDate);
// Avoid time zone inconsistency using the utils.createDateObject
// method, instead of the native Date object.
const dateObj = gl.utils.createDateObject(this.rawSelectedDate);
this.displayedDate = $.datepicker.formatDate('M d, yy', dateObj);
this.displayedDate = $.datepicker.formatDate('M d, yy', dateObj);
} else {
} else {
this.displayedDate = 'No due date';
this.displayedDate = 'No due date';
...
@@ -176,5 +180,6 @@
...
@@ -176,5 +180,6 @@
}
}
global.DueDateSelectors = DueDateSelectors;
global.DueDateSelectors = DueDateSelectors;
global.DueDateSelect = DueDateSelect;
})(window.gl || (window.gl = {}));
})(window.gl || (window.gl = {}));
app/assets/javascripts/lib/utils/datetime_utility.js
View file @
e8b9d0c2
...
@@ -16,6 +16,19 @@
...
@@ -16,6 +16,19 @@
}
}
w
.
gl
.
utils
.
days
=
[
'
Sunday
'
,
'
Monday
'
,
'
Tuesday
'
,
'
Wednesday
'
,
'
Thursday
'
,
'
Friday
'
,
'
Saturday
'
];
w
.
gl
.
utils
.
days
=
[
'
Sunday
'
,
'
Monday
'
,
'
Tuesday
'
,
'
Wednesday
'
,
'
Thursday
'
,
'
Friday
'
,
'
Saturday
'
];
// createDateObject must be used instead of using native Date object
// to create a new Date instance using string as param - '2016-11-10' or
// '2016/11/10' in order to avoid time zone inconsistency.
w
.
gl
.
utils
.
createDateObject
=
function
(
string
)
{
var
dateSeparator
=
string
.
indexOf
(
'
-
'
)
>
-
1
?
'
-
'
:
'
/
'
;
var
dateArray
=
string
.
split
(
dateSeparator
).
map
(
function
(
dateItem
)
{
return
parseInt
(
dateItem
,
10
);
});
return
new
Date
(
dateArray
[
0
],
dateArray
[
1
]
-
1
,
dateArray
[
2
]);
}
w
.
gl
.
utils
.
formatDate
=
function
(
datetime
)
{
w
.
gl
.
utils
.
formatDate
=
function
(
datetime
)
{
return
dateFormat
(
datetime
,
'
mmm d, yyyy h:MMtt Z
'
);
return
dateFormat
(
datetime
,
'
mmm d, yyyy h:MMtt Z
'
);
};
};
...
...
changelogs/unreleased/fix-timezone-due-date-picker.yml
0 → 100644
View file @
e8b9d0c2
---
title
:
Fix date inconsistency on due date picker
merge_request
:
author
:
Giuliano Varriale
spec/javascripts/datetime_utility_spec.js.es6
View file @
e8b9d0c2
...
@@ -2,6 +2,38 @@
...
@@ -2,6 +2,38 @@
(() => {
(() => {
describe('Date time utils', () => {
describe('Date time utils', () => {
describe('create date object', () => {
describe('using dashes', () => {
it('should instantiate the date object using integer params', () => {
spyOn(window, 'Date')
gl.utils.createDateObject('2016-11-12');
expect(window.Date).toHaveBeenCalledWith(2016, 10, 12);
});
it('should return the right date object ', () => {
const date = gl.utils.createDateObject('2016-11-12');
expect(date.getDate()).toBe(12);
expect(date.getMonth()).toBe(10);
expect(date.getFullYear()).toBe(2016);
});
});
describe('using slashes', () => {
it('should instantiate the date object using integer params', () => {
spyOn(window, 'Date')
gl.utils.createDateObject('2016/08/02');
expect(window.Date).toHaveBeenCalledWith(2016, 7, 2);
});
it('should return the right date object', () => {
const date = gl.utils.createDateObject('2016/08/02');
expect(date.getDate()).toBe(2);
expect(date.getMonth()).toBe(7);
expect(date.getFullYear()).toBe(2016);
});
});
});
describe('get day name', () => {
describe('get day name', () => {
it('should return Sunday', () => {
it('should return Sunday', () => {
const day = gl.utils.getDayName(new Date('07/17/2016'));
const day = gl.utils.getDayName(new Date('07/17/2016'));
...
...
spec/javascripts/due_date_select_spec.js.es6
0 → 100644
View file @
e8b9d0c2
/* eslint-disable */
//= require lib/utils/datetime_utility
//= require jquery
/*= require jquery-ui/datepicker */
/*= require gl_dropdown */
//= require due_date_select
(() => {
describe('Due Date Select', () => {
describe('parseSelectedDate()', () => {
it('call create date object', () => {
const $dom = $(fixture.preload('due_date_select.html')[0]);
const dueDateSelect = new gl.DueDateSelect({
$context: $dom,
$dropdown: $dom.find('.js-due-date-select'),
$loading: $dom.find('.block-loading')
});
spyOn(gl.utils, 'createDateObject');
dueDateSelect.parseSelectedDate();
expect(gl.utils.createDateObject).toHaveBeenCalledWith('2016-11-20');
});
});
});
})();
spec/javascripts/fixtures/due_date_select.html.haml
0 → 100644
View file @
e8b9d0c2
.block.due_date
.sidebar-collapsed-icon
%i
.fa.fa-calendar
%span
.js-due-date-sidebar-value
Nov 20, 2016
.title.hide-collapsed
Due date
%i
.fa.fa-spinner.fa-spin.block-loading
%a
.edit-link.pull-right
{
href:
"#"
}
Edit
.value.hide-collapsed
%span
.value-content
%span
.bold
Nov 20, 2016
%span
.no-value.js-remove-due-date-holder
%a
.js-remove-due-date
{
href:
"#"
,
role:
"button"
}
remove due date
.selectbox.hide-collapsed
%input
{
type:
"hidden"
,
name:
"issue[due_date]"
,
id:
"issue[due_date]"
,
value:
"2016-11-20"
}
.dropdown
%button
.dropdown-menu-toggle.js-due-date-select
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
field_name:
"issue[due_date]"
,
ability_name:
"issue"
,
issue_update:
"/h5bp/html5-boilerplate/issues/10.json"
}
}
%span
.dropdown-toggle-text
Due date
%i
.fa.fa-chevron-down
.dropdown-menu.dropdown-menu-due-date
.dropdown-title
%span
Due Date
%button
.dropdown-title-button.dropdown-menu-close
{
type:
"button"
}
%i
.fa.fa-times.dropdown-menu-close-icon
.dropdown-content
.js-due-date-calendar
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