diff options
| author | mistic100 <mistic@piwigo.org> | 2015-02-13 08:34:20 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2015-02-13 08:34:20 +0000 |
| commit | f5979a419e3d328ca5a5d6ee4c56feb5dab143cf (patch) | |
| tree | e173ff7f30b2435de23148d46c1938a5b39d7499 /admin/themes | |
| parent | cd74b8548f0f9217102db1eec9cb6ca5616f6fd5 (diff) | |
Merged revision(s) 30956 from trunk:
bug 3188: history search, trailing space in dates
git-svn-id: http://piwigo.org/svn/branches/2.7@30957 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
| -rw-r--r-- | admin/themes/default/js/datepicker.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/themes/default/js/datepicker.js b/admin/themes/default/js/datepicker.js index 2c72f823f..cabf1f479 100644 --- a/admin/themes/default/js/datepicker.js +++ b/admin/themes/default/js/datepicker.js @@ -107,6 +107,7 @@ jQuery.fn.pwgDatepicker = function(settings) { $this.datetimepicker(jQuery.extend({ dateFormat: linked ? 'DD d MM yy' : 'yy-mm-dd', timeFormat: 'HH:mm', + separator: options.showTimepicker ? ' ' : '', altField: linked ? $target : null, altFormat: 'yy-mm-dd', |