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

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-08-04 20:31:47 +02:00
commit 47ee3dc957
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/calendar/calendar_ui.js
View file

@ -324,7 +324,8 @@ function rcube_calendar_ui(settings)
// open jquery UI dialog // open jquery UI dialog
$dialog.dialog({ $dialog.dialog({
modal: false, modal: false,
resizable: true, resizable: !bw.ie6,
closeOnEscape: !bw.ie6,
title: null, title: null,
close: function() { close: function() {
$dialog.dialog('destroy').hide(); $dialog.dialog('destroy').hide();
@ -350,7 +351,7 @@ function rcube_calendar_ui(settings)
// close show dialog first // close show dialog first
$("#eventshow").dialog('close'); $("#eventshow").dialog('close');
var $dialog = $("#eventedit"); var $dialog = $('<div>');
var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:action=='new' }; var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:action=='new' };
me.selected_event = $.extend($.extend({}, event_defaults), event); // clone event object (with defaults) me.selected_event = $.extend($.extend({}, event_defaults), event); // clone event object (with defaults)
event = me.selected_event; // change reference to clone event = me.selected_event; // change reference to clone
@ -636,14 +637,17 @@ function rcube_calendar_ui(settings)
// activate the first tab // activate the first tab
$('#eventtabs').tabs('select', 0); $('#eventtabs').tabs('select', 0);
var editform = $("#eventedit");
// open jquery UI dialog // open jquery UI dialog
$dialog.dialog({ $dialog.dialog({
modal: true, modal: true,
resizable: true, resizable: !bw.ie6,
closeOnEscape: false, closeOnEscape: false,
title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'), title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
close: function() { close: function() {
$dialog.dialog("destroy").hide(); editform.hide().appendTo(document.body);
$dialog.dialog("destroy").remove();
rcmail.ksearch_blur(); rcmail.ksearch_blur();
rcmail.ksearch_destroy(); rcmail.ksearch_destroy();
freebusy_data = {}; freebusy_data = {};
@ -651,7 +655,10 @@ function rcube_calendar_ui(settings)
buttons: buttons, buttons: buttons,
minWidth: 500, minWidth: 500,
width: 580 width: 580
}).show(); }).append(editform.show()); // adding form content AFTERWARDS massively speeds up opening on IE6
// set dialog size according to form content
me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 530);
title.select(); title.select();