plugins/libcalendaring
Thomas Brüderli
bruederli at kolabsys.com
Tue Jul 1 17:38:55 CEST 2014
plugins/libcalendaring/libcalendaring.js | 11 +++++------
plugins/libcalendaring/skins/larry/libcal.css | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 7ebe734c45ab8e98944e4946f225e00759c12b9e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Jul 1 17:38:50 2014 +0200
Fix alarms display popup after jQuery UI update in Roundcube core
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 0ccce4c..c31409d 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -434,12 +434,12 @@ function rcube_libcalendaring(settings)
{
// clear old alert first
if (this.alarm_dialog)
- this.alarm_dialog.dialog('destroy');
+ this.alarm_dialog.dialog('destroy').remove();
this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
- var actions, adismiss, asnooze, alarm, html, event_ids = [];
- for (var i=0; i < alarms.length; i++) {
+ var i, actions, adismiss, asnooze, alarm, html, event_ids = [], buttons = {};
+ for (i=0; i < alarms.length; i++) {
alarm = alarms[i];
alarm.start = this.parseISO8601(alarm.start);
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);
}
- var buttons = {};
buttons[rcmail.gettext('dismissall','libcalendaring')] = function() {
// submit dismissed event_ids to server
me.dismiss_alarm(me.alarm_ids.join(','), 0);
@@ -474,8 +473,8 @@ function rcube_libcalendaring(settings)
modal: false,
resizable: true,
closeOnEscape: false,
- dialogClass: 'alarm',
- title: '<span class="ui-icon ui-icon-alarms" style="float:left; margin:0 4px 0 0"></span>' + rcmail.gettext('alarmtitle','libcalendaring'),
+ dialogClass: 'alarms',
+ title: rcmail.gettext('alarmtitle','libcalendaring'),
buttons: buttons,
close: function() {
$('#alarm-snooze-dropdown').hide();
diff --git a/plugins/libcalendaring/skins/larry/libcal.css b/plugins/libcalendaring/skins/larry/libcal.css
index 7e0e0b7..7cfe630 100644
--- a/plugins/libcalendaring/skins/larry/libcal.css
+++ b/plugins/libcalendaring/skins/larry/libcal.css
@@ -46,11 +46,11 @@ span.edit-alarm-set {
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-repeat: no-repeat;
background-position: 0 -91px;
- width: 20px;
- height: 16px;
+ padding-left: 24px;
}
.itip-reply-comment {
More information about the commits
mailing list