jingrow/air-datepicker
1
0
Fork 0
mirror of https://github.com/frappe/air-datepicker.git synced 2026-01-14 11:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

added support of 12 hours mode at altFieldDateFormat, fixes #66

Browse Source
This commit is contained in:
t1m0n 2016-06-06 11:01:33 +03:00
parent 8dbf738ea6
commit 44ce4aede2
5 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/js/datepicker.js vendored
View File

@ -362,11 +362,12 @@
d = datepicker.getParsedDate(date), d = datepicker.getParsedDate(date),
fullHours = d.fullHours, fullHours = d.fullHours,
hours = d.hours, hours = d.hours,
ampm = string.match(boundary('aa')) || string.match(boundary('AA')),
dayPeriod = 'am', dayPeriod = 'am',
validHours; validHours;
if (this.opts.timepicker && this.timepicker && this.ampm) { if (this.opts.timepicker && this.timepicker && ampm) {
validHours = this.timepicker._getValidHoursFromDate(date); validHours = this.timepicker._getValidHoursFromDate(date, ampm);
fullHours = leadingZero(validHours.hours); fullHours = leadingZero(validHours.hours);
hours = validHours.hours; hours = validHours.hours;
dayPeriod = validHours.dayPeriod; dayPeriod = validHours.dayPeriod;
@ -2055,10 +2056,11 @@
/** /**
* Calculates valid hour value to display in text input and datepicker's body. * Calculates valid hour value to display in text input and datepicker's body.
* @param date {Date|Number} - date or hours * @param date {Date|Number} - date or hours
* @param [ampm] {Boolean} - 12 hours mode
* @returns {{hours: *, dayPeriod: string}} * @returns {{hours: *, dayPeriod: string}}
* @private * @private
*/ */
_getValidHoursFromDate: function (date) { _getValidHoursFromDate: function (date, ampm) {
var d = date, var d = date,
hours = date; hours = date;
@ -2067,10 +2069,10 @@
hours = d.hours; hours = d.hours;
} }
var ampm = this.d.ampm, var _ampm = ampm || this.d.ampm,
dayPeriod = 'am'; dayPeriod = 'am';
if (ampm) { if (_ampm) {
switch(true) { switch(true) {
case hours == 0: case hours == 0:
hours = 12; hours = 12;

4
dist/js/datepicker.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/js/datepicker.js
View File

@ -362,11 +362,12 @@
d = datepicker.getParsedDate(date), d = datepicker.getParsedDate(date),
fullHours = d.fullHours, fullHours = d.fullHours,
hours = d.hours, hours = d.hours,
ampm = string.match(boundary('aa')) || string.match(boundary('AA')),
dayPeriod = 'am', dayPeriod = 'am',
validHours; validHours;
if (this.opts.timepicker && this.timepicker && this.ampm) { if (this.opts.timepicker && this.timepicker && ampm) {
validHours = this.timepicker._getValidHoursFromDate(date); validHours = this.timepicker._getValidHoursFromDate(date, ampm);
fullHours = leadingZero(validHours.hours); fullHours = leadingZero(validHours.hours);
hours = validHours.hours; hours = validHours.hours;
dayPeriod = validHours.dayPeriod; dayPeriod = validHours.dayPeriod;

7
src/js/timepicker.js
View File

@ -171,10 +171,11 @@
/** /**
* Calculates valid hour value to display in text input and datepicker's body. * Calculates valid hour value to display in text input and datepicker's body.
* @param date {Date|Number} - date or hours * @param date {Date|Number} - date or hours
* @param [ampm] {Boolean} - 12 hours mode
* @returns {{hours: *, dayPeriod: string}} * @returns {{hours: *, dayPeriod: string}}
* @private * @private
*/ */
_getValidHoursFromDate: function (date) { _getValidHoursFromDate: function (date, ampm) {
var d = date, var d = date,
hours = date; hours = date;
@ -183,10 +184,10 @@
hours = d.hours; hours = d.hours;
} }
var ampm = this.d.ampm, var _ampm = ampm || this.d.ampm,
dayPeriod = 'am'; dayPeriod = 'am';
if (ampm) { if (_ampm) {
switch(true) { switch(true) {
case hours == 0: case hours == 0:
hours = 12; hours = 12;

32
tests/specs/options.js
View File

@ -189,6 +189,36 @@ describe('Options', function () {
dp.selectDate(date); dp.selectDate(date);
assert.equal(dp.$altField.val(), '17-12-2015'); assert.equal(dp.$altField.val(), '17-12-2015');
});
it('should support 24 hour mode, even if main date format is in 12', function () {
var date = new Date(2015, 11, 17, 22, 47);
dp = $input.datepicker({
timepicker: true,
timeFormat: 'hh:ii aa',
altField: '.alt-field',
altFieldDateFormat: 'dd-mm-yyyy hh:ii'
}).data('datepicker');
dp.selectDate(date);
assert.equal(dp.$altField.val(), '17-12-2015 22:47');
});
it('should support 12 hour mode', function () {
var date = new Date(2015, 11, 17, 22, 47);
dp = $input.datepicker({
timepicker: true,
timeFormat: 'hh:ii',
altField: '.alt-field',
altFieldDateFormat: 'dd-mm-yyyy hh:ii aa'
}).data('datepicker');
dp.selectDate(date);
assert.equal(dp.$altField.val(), '17-12-2015 10:47 pm');
}) })
}); });
@ -216,7 +246,7 @@ describe('Options', function () {
expect(dp.selectedDates).to.have.length(1) expect(dp.selectedDates).to.have.length(1)
}) })
}) });
describe('keyboardNav', function () { describe('keyboardNav', function () {
var year = 2015, var year = 2015,