Skip to content

Commit

Permalink
datepicker updates
Browse files Browse the repository at this point in the history
  • Loading branch information
liedekef committed Jan 15, 2025
1 parent f4158b4 commit 455f30e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion css/eme.css
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ div#div_import {
/* for some fields, only works in chrome for now
* see https://developer.chrome.com/docs/css-ui/css-field-sizing
* */
.eme_formfield_fdatetime, .eme_formfield_fdate, #chooseperson, #eventmail_chooseperson, #chooseevent, .eme_searchfilter {
.eme_formfield_fdatetime, .eme_formfield_fdate, #chooseperson, #eventmail_chooseperson, #chooseevent, .eme_searchfilter, #genericmail_startdate, #eventmail_startdate {
field-sizing: content;
min-inline-size: 10ch;
}
Expand Down
2 changes: 2 additions & 0 deletions js/eme.js
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,7 @@ jQuery(document).ready( function($) {
language: emebasic.translate_flanguage,
firstDay: parseInt(emebasic.translate_firstDayOfWeek),
altFieldDateFormat: 'Y-m-d H:i:00',
multipleDatesSeparator: ", ",
dateFormat: emebasic.translate_fdateformat,
timeFormat: emebasic.translate_ftimeformat
});
Expand Down Expand Up @@ -964,6 +965,7 @@ jQuery(document).ready( function($) {
language: emebasic.translate_flanguage,
firstDay: parseInt(emebasic.translate_firstDayOfWeek),
altFieldDateFormat: 'Y-m-d',
multipleDatesSeparator: ", ",
dateFormat: emebasic.translate_fdateformat
});
$.each($('.eme_formfield_fdate'), function() {
Expand Down
4 changes: 4 additions & 0 deletions js/eme_admin_sendmails.js
Original file line number Diff line number Diff line change
Expand Up @@ -629,11 +629,13 @@ jQuery(document).ready( function($) {
$('#eventmail_startdate').fdatepicker({
todayButton: new Date(),
clearButton: true,
fieldSizing: true,
timepicker: true,
minutesStep: parseInt(ememails.translate_minutesStep),
language: ememails.translate_flanguage,
firstDay: parseInt(ememails.translate_firstDayOfWeek),
altFieldDateFormat: 'Y-m-d H:i:00',
multipleDatesSeparator: ', ',
dateFormat: ememails.translate_fdateformat,
timeFormat: ememails.translate_ftimeformat,
onSelect: function(formattedDate,date,inst) {
Expand All @@ -655,11 +657,13 @@ jQuery(document).ready( function($) {
$('#genericmail_startdate').fdatepicker({
todayButton: new Date(),
clearButton: true,
fieldSizing: true,
timepicker: true,
minutesStep: parseInt(ememails.translate_minutesStep),
language: ememails.translate_flanguage,
firstDay: parseInt(ememails.translate_firstDayOfWeek),
altFieldDateFormat: 'Y-m-d H:i:00',
multipleDatesSeparator: ', ',
dateFormat: ememails.translate_fdateformat,
timeFormat: ememails.translate_ftimeformat,
onSelect: function(formattedDate,date,inst) {
Expand Down
4 changes: 4 additions & 0 deletions js/fdatepicker/js/fdatepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,10 @@
if (!this.opts.fieldSizing) {
return;
}
// make sure the empty field has a minimum inline size
if (!(input.val() || input.attr('placeholder')) && input.css('min-inline-size') == "0px") {
input.css({'min-inline-size': '10ch'});
}

// Create a temporary span to measure the text width
const tempSpan = $('<span>').css({
Expand Down
2 changes: 1 addition & 1 deletion js/fdatepicker/js/fdatepicker.min.js

Large diffs are not rendered by default.

0 comments on commit 455f30e

Please sign in to comment.