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

Fix alarms display popup after jQuery UI update in Roundcube core

Browse source
This commit is contained in:
Thomas Bruederli 2014-07-01 17:38:50 +02:00
parent ed6080fcc4
commit 7ebe734c45
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/libcalendaring/libcalendaring.js
View file

@ -434,12 +434,12 @@ function rcube_libcalendaring(settings)
{ {
// clear old alert first // clear old alert first
if (this.alarm_dialog) if (this.alarm_dialog)
this.alarm_dialog.dialog('destroy'); this.alarm_dialog.dialog('destroy').remove();
this.alarm_dialog = $('<div>').attr('id', 'alarm-display'); this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
var actions, adismiss, asnooze, alarm, html, event_ids = []; var i, actions, adismiss, asnooze, alarm, html, event_ids = [], buttons = {};
for (var i=0; i < alarms.length; i++) { for (i=0; i < alarms.length; i++) {
alarm = alarms[i]; alarm = alarms[i];
alarm.start = this.parseISO8601(alarm.start); alarm.start = this.parseISO8601(alarm.start);
alarm.end = this.parseISO8601(alarm.end); alarm.end = this.parseISO8601(alarm.end);
@ -463,7 +463,6 @@ function rcube_libcalendaring(settings)
$('<div>').addClass('alarm-item').html(html).append(actions).appendTo(this.alarm_dialog); $('<div>').addClass('alarm-item').html(html).append(actions).appendTo(this.alarm_dialog);
} }
var buttons = {};
buttons[rcmail.gettext('dismissall','libcalendaring')] = function() { buttons[rcmail.gettext('dismissall','libcalendaring')] = function() {
// submit dismissed event_ids to server // submit dismissed event_ids to server
me.dismiss_alarm(me.alarm_ids.join(','), 0); me.dismiss_alarm(me.alarm_ids.join(','), 0);
@ -474,8 +473,8 @@ function rcube_libcalendaring(settings)
modal: false, modal: false,
resizable: true, resizable: true,
closeOnEscape: false, closeOnEscape: false,
dialogClass: 'alarm', dialogClass: 'alarms',
title: '<span class="ui-icon ui-icon-alarms" style="float:left; margin:0 4px 0 0"></span>' + rcmail.gettext('alarmtitle','libcalendaring'), title: rcmail.gettext('alarmtitle','libcalendaring'),
buttons: buttons, buttons: buttons,
close: function() { close: function() {
$('#alarm-snooze-dropdown').hide(); $('#alarm-snooze-dropdown').hide();

6
plugins/libcalendaring/skins/larry/libcal.css
View file

@ -46,11 +46,11 @@ span.edit-alarm-set {
white-space: nowrap; white-space: nowrap;
} }
.ui-widget-header .ui-dialog-title .ui-icon-alarms { .ui-dialog.alarms .ui-dialog-title {
background-image: url(../../../../skins/larry/images/messages.png); background-image: url(../../../../skins/larry/images/messages.png);
background-repeat: no-repeat;
background-position: 0 -91px; background-position: 0 -91px;
width: 20px; padding-left: 24px;
height: 16px;
} }
.itip-reply-comment { .itip-reply-comment {