tracer/x-editable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update combodate to 1.0.4, fix

Browse Source
This commit is contained in:
vitalets 2013-05-12 14:28:26 +04:00
parent 127f8d5fa4
commit a12a01b07f
2 changed files with 37 additions and 13 deletions
CHANGELOG.txt
src/inputs/combodate/lib
combodate.js

4
CHANGELOG.txt

@ -1,6 +1,10 @@
X-editable changelog X-editable changelog
============================= =============================
Version 1.4.5 wip
----------------------------
[enh] update combodate to 1.0.4, fix #222 (vitalets)
Version 1.4.4 May 4, 2013 Version 1.4.4 May 4, 2013
---------------------------- ----------------------------

46
src/inputs/combodate/lib/combodate.js

@ -1,10 +1,20 @@
/** /**
* Combodate - 1.0.3 * Combodate - 1.0.4
* Dropdown date and time picker. * Dropdown date and time picker.
* Converts text input into dropdowns to pick day, month, year, hour, minute and second. * Converts text input into dropdowns to pick day, month, year, hour, minute and second.
* Uses momentjs as datetime library http://momentjs.com. * Uses momentjs as datetime library http://momentjs.com.
* For i18n include corresponding file from https://github.com/timrwood/moment/tree/master/lang * For i18n include corresponding file from https://github.com/timrwood/moment/tree/master/lang
* *
* Confusion at noon and midnight - see http://en.wikipedia.org/wiki/12-hour_clock#Confusion_at_noon_and_midnight
* In combodate:
* 12:00 pm --> 12:00 (24-h format, midday)
* 12:00 am --> 00:00 (24-h format, midnight, start of day)
*
* Differs from momentjs parse rules:
* 00:00 pm, 12:00 pm --> 12:00 (24-h format, day not change)
* 00:00 am, 12:00 am --> 00:00 (24-h format, day not change)
*
*
* Author: Vitaliy Potapov * Author: Vitaliy Potapov
* Project page: http://github.com/vitalets/combodate * Project page: http://github.com/vitalets/combodate
* Copyright (c) 2012 Vitaliy Potapov. Released under MIT License. * Copyright (c) 2012 Vitaliy Potapov. Released under MIT License.
@ -154,9 +164,10 @@
for(i=0; i<=11; i++) { for(i=0; i<=11; i++) {
if(longNames) { if(longNames) {
name = moment().month(i).format('MMMM'); //see https://github.com/timrwood/momentjs.com/pull/36
name = moment().date(1).month(i).format('MMMM');
} else if(shortNames) { } else if(shortNames) {
name = moment().month(i).format('MMM'); name = moment().date(1).month(i).format('MMM');
} else if(twoDigit) { } else if(twoDigit) {
name = this.leadZero(i+1); name = this.leadZero(i+1);
} else { } else {
@ -192,9 +203,10 @@
h12 = this.options.template.indexOf('h') !== -1, h12 = this.options.template.indexOf('h') !== -1,
h24 = this.options.template.indexOf('H') !== -1, h24 = this.options.template.indexOf('H') !== -1,
twoDigit = this.options.template.toLowerCase().indexOf('hh') !== -1, twoDigit = this.options.template.toLowerCase().indexOf('hh') !== -1,
min = h12 ? 1 : 0,
max = h12 ? 12 : 23; max = h12 ? 12 : 23;
for(i=0; i<=max; i++) { for(i=min; i<=max; i++) {
name = twoDigit ? this.leadZero(i) : i; name = twoDigit ? this.leadZero(i) : i;
items.push([i, name]); items.push([i, name]);
} }
@ -243,7 +255,7 @@
}, },
/* /*
Returns current date value. Returns current date value from combos.
If format not specified - `options.format` used. If format not specified - `options.format` used.
If format = `null` - Moment object returned. If format = `null` - Moment object returned.
*/ */
@ -272,12 +284,14 @@
return ''; return '';
} }
//convert hours if 12h format //convert hours 12h --> 24h
if(this.$ampm) { if(this.$ampm) {
values.hour = this.$ampm.val() === 'am' ? values.hour : values.hour+12; //12:00 pm --> 12:00 (24-h format, midday), 12:00 am --> 00:00 (24-h format, midnight, start of day)
if(values.hour === 24) { if(values.hour === 12) {
values.hour = 0; values.hour = this.$ampm.val() === 'am' ? 0 : 12;
} } else {
values.hour = this.$ampm.val() === 'am' ? values.hour : values.hour+12;
}
} }
dt = moment([values.year, values.month, values.day, values.hour, values.minute, values.second]); dt = moment([values.year, values.month, values.day, values.hour, values.minute, values.second]);
@ -328,11 +342,17 @@
}); });
if(this.$ampm) { if(this.$ampm) {
if(values.hour > 12) { //12:00 pm --> 12:00 (24-h format, midday), 12:00 am --> 00:00 (24-h format, midnight, start of day)
values.hour -= 12; if(values.hour >= 12) {
values.ampm = 'pm'; values.ampm = 'pm';
if(values.hour > 12) {
values.hour -= 12;
}
} else { } else {
values.ampm = 'am'; values.ampm = 'am';
if(values.hour === 0) {
values.hour = 12;
}
} }
} }