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

Fix so when switching from compose to calendar confirmation alert will be displayed (#530)

Browse source
This commit is contained in:
Aleksander Machniak 2011-12-02 15:12:52 +01:00
parent fbd78c4fc5
commit 2f570dd126
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar_base.js
View file

@ -265,7 +265,7 @@ rcube_calendar.fetch_event_rsvp_status = function(event)
window.rcmail && rcmail.addEventListener('init', function(evt) { window.rcmail && rcmail.addEventListener('init', function(evt) {
if (rcmail.task != 'calendar') { if (rcmail.task != 'calendar') {
var cal = new rcube_calendar(rcmail.env.calendar_settings); var cal = new rcube_calendar(rcmail.env.calendar_settings);
rcmail.addEventListener('plugin.display_alarms', function(alarms){ cal.display_alarms(alarms); }); rcmail.addEventListener('plugin.display_alarms', function(alarms){ cal.display_alarms(alarms); });
rcmail.addEventListener('plugin.update_event_rsvp_status', function(p){ rcmail.addEventListener('plugin.update_event_rsvp_status', function(p){
@ -294,6 +294,8 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
rcmail.enable_command('calendar-create-from-mail', true); rcmail.enable_command('calendar-create-from-mail', true);
} }
} }
rcmail.register_command('plugin.calendar', function() { rcmail.switch_task('calendar'); }, true);
rcmail.addEventListener('plugin.ping_url', function(p){ rcmail.addEventListener('plugin.ping_url', function(p){
var action = p.action; var action = p.action;

9
plugins/calendar/lib/calendar_ui.php
View file

@ -48,10 +48,11 @@ class calendar_ui
// add taskbar button // add taskbar button
$this->cal->add_button(array( $this->cal->add_button(array(
'name' => 'calendar', 'name' => 'calendar',
'class' => 'button-calendar', 'class' => 'button-calendar',
'label' => 'calendar.calendar', 'label' => 'calendar.calendar',
'href' => './?_task=calendar', 'href' => './?_task=calendar',
'onclick' => sprintf("%s.command('plugin.calendar');return false", JS_OBJECT_NAME),
), 'taskbar'); ), 'taskbar');
// load basic client script (which - unfortunately - requires fullcalendar) // load basic client script (which - unfortunately - requires fullcalendar)