Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly initialize time selection for all reminder time inputs

Browse source
This commit is contained in:
Aleksander Machniak 2017-12-04 13:36:26 +01:00
parent 8673bfd15f
commit 1f0f282049
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar_ui.js
View file

@ -3994,7 +3994,7 @@ function rcube_calendar_ui(settings)
$('#edit-allday').click(function(){ $('#edit-starttime, #edit-endtime')[(this.checked?'hide':'show')](); event_times_changed(); }); $('#edit-allday').click(function(){ $('#edit-starttime, #edit-endtime')[(this.checked?'hide':'show')](); event_times_changed(); });
// configure drop-down menu on time input fields based on jquery UI autocomplete // configure drop-down menu on time input fields based on jquery UI autocomplete
$('#edit-starttime, #edit-endtime, #eventedit input.edit-alarm-time').each(function() { $('#edit-starttime, #edit-endtime').each(function() {
me.init_time_autocomplete(this, { me.init_time_autocomplete(this, {
container: '#eventedit', container: '#eventedit',
change: event_times_changed change: event_times_changed

14
plugins/libcalendaring/libcalendaring.js
View file

@ -391,12 +391,13 @@ function rcube_libcalendaring(settings)
}); });
$(prefix+' select.edit-alarm-offset').change(function(){ $(prefix+' select.edit-alarm-offset').change(function(){
var val = $(this).val(), parent = $(this).parent(); var val = $(this).val(), parent = $(this).parent();
parent.find('.edit-alarm-date, .edit-alarm-time')[val == '@' ? 'show' : 'hide'](); parent.find('.edit-alarm-date, .edit-alarm-time')[val === '@' ? 'show' : 'hide']();
parent.find('.edit-alarm-value').prop('disabled', val === '@' || val === '0'); parent.find('.edit-alarm-value').prop('disabled', val === '@' || val === '0');
parent.find('.edit-alarm-related')[val == '@' ? 'hide' : 'show'](); parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show']();
}); });
$(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(datepicker_settings); $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(datepicker_settings);
this.init_time_autocomplete($(prefix+' .edit-alarm-time')[0], {});
$(prefix).on('click', 'a.delete-alarm', function(e){ $(prefix).on('click', 'a.delete-alarm', function(e){
if ($(this).closest('.edit-alarm-item').siblings().length > 0) { if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
@ -434,11 +435,10 @@ function rcube_libcalendaring(settings)
if (!alarm.action) if (!alarm.action)
alarm.action = 'DISPLAY'; alarm.action = 'DISPLAY';
if (i == 0) {
domnode = $(prefix + ' .edit-alarm-item').eq(0); domnode = $(prefix + ' .edit-alarm-item').eq(0);
}
else { if (i > 0) {
domnode = $(prefix + ' .edit-alarm-item').eq(0).clone(false).removeClass('first').appendTo(prefix); domnode = domnode.clone(false).removeClass('first').appendTo(prefix);
this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i); this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
} }
@ -588,7 +588,7 @@ function rcube_libcalendaring(settings)
var default_props = { var default_props = {
delay: 100, delay: 100,
minLength: 1, minLength: 1,
appendTo: props.container, appendTo: props.container || $(elem).parents('form'),
source: time_autocomplete_list, source: time_autocomplete_list,
open: time_autocomplete_open, open: time_autocomplete_open,
// change: time_autocomplete_change, // change: time_autocomplete_change,

2
plugins/tasklist/tasklist.js
View file

@ -733,7 +733,7 @@ function rcube_tasklist_ui(settings)
}); });
// configure drop-down menu on time input fields based on jquery UI autocomplete // configure drop-down menu on time input fields based on jquery UI autocomplete
$('#taskedit-starttime, #taskedit-time, #taskedit input.edit-alarm-time').each(function() { $('#taskedit-starttime, #taskedit-time').each(function() {
me.init_time_autocomplete(this, {container: '#taskedit'}); me.init_time_autocomplete(this, {container: '#taskedit'});
}); });
} }