plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js |   39 +++++++++++++++++++++++++++------------
 plugins/tasklist/tasklist.js    |   12 +++++++++---
 2 files changed, 36 insertions(+), 15 deletions(-)

New commits:
commit 1b1205ba299fd8e5c4eceb0ba0955dd339c59505
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 7 18:38:23 2012 +0100

    Adapt to regressions in jQuery 1.8 and jQuery UI 1.9

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index e984e60..57a5947 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -249,7 +249,7 @@ function rcube_calendar_ui(settings)
     // event details dialog (show only)
     var event_show_dialog = function(event)
     {
-      var $dialog = $("#eventshow").dialog('close').removeClass().addClass('uidialog');
+      var $dialog = $("#eventshow").removeClass().addClass('uidialog');
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:false };
       me.selected_event = event;
 
@@ -382,7 +382,7 @@ function rcube_calendar_ui(settings)
     var event_edit_dialog = function(action, event)
     {
       // close show dialog first
-      $("#eventshow").dialog('close');
+      $("#eventshow:ui-dialog").dialog('close');
       
       var $dialog = $('<div>');
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:action=='new' };
@@ -721,8 +721,11 @@ function rcube_calendar_ui(settings)
     // open a dialog to display detailed free-busy information and to find free slots
     var event_freebusy_dialog = function()
     {
-      var $dialog = $('#eventfreebusy').dialog('close');
-      var event = me.selected_event;
+      var $dialog = $('#eventfreebusy'),
+        event = me.selected_event;
+      
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
       
       if (!event_attendees.length)
         return false;
@@ -966,7 +969,9 @@ function rcube_calendar_ui(settings)
     {
       var overlay = $('#schedule-event-time');
       if (me.selected_event.end.getTime() <= freebusy_ui.start.getTime() || me.selected_event.start.getTime() >= freebusy_ui.end.getTime()) {
-        overlay.draggable('disable').hide();
+        overlay.hide();
+        if (overlay.data('isdraggable'))
+          overlay.draggable('disable');
       }
       else {
         var table = $('#schedule-freebusy-times'),
@@ -1000,7 +1005,7 @@ function rcube_calendar_ui(settings)
 
         // overlay is visible
         if (width > 0) {
-          overlay.css({ width: (width-5)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).draggable('enable').show();
+          overlay.css({ width: (width-5)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).show();
           
           // configure draggable
           if (!overlay.data('isdraggable')) {
@@ -1034,6 +1039,8 @@ function rcube_calendar_ui(settings)
               }
             }).data('isdraggable', true);
           }
+          else
+            overlay.draggable('enable');
         }
         else
           overlay.draggable('disable').hide();
@@ -1640,7 +1647,7 @@ function rcube_calendar_ui(settings)
     // opens calendar day-view in a popup
     this.fisheye_view = function(date)
     {
-      $('#fish-eye-view').dialog('close');
+      $('#fish-eye-view:ui-dialog').dialog('close');
       
       // create list of active event sources
       var src, cals = {}, sources = [];
@@ -1745,7 +1752,9 @@ function rcube_calendar_ui(settings)
     this.calendar_edit_dialog = function(calendar)
     {
       // close show dialog first
-      var $dialog = $("#calendarform").dialog('close');
+      var $dialog = $("#calendarform");
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
       
       if (!calendar)
         calendar = { name:'', color:'cc0000', editable:true, showalarms:true };
@@ -1842,8 +1851,11 @@ function rcube_calendar_ui(settings)
     this.import_events = function(calendar)
     {
       // close show dialog first
-      var $dialog = $("#eventsimport").dialog('close');
-      var form = rcmail.gui_objects.importform;
+      var $dialog = $("#eventsimport"),
+        form = rcmail.gui_objects.importform;
+      
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
       
       $('#event-import-calendar').val(calendar.id);
       
@@ -1881,7 +1893,7 @@ function rcube_calendar_ui(settings)
     // callback from server if import succeeded
     this.import_success = function(p)
     {
-      $("#eventsimport").dialog('close');
+      $("#eventsimport:ui-dialog").dialog('close');
       rcmail.set_busy(false, null, me.saving_lock);
       rcmail.gui_objects.importform.reset();
 
@@ -1892,7 +1904,10 @@ function rcube_calendar_ui(settings)
     // show URL of the given calendar in a dialog box
     this.showurl = function(calendar)
     {
-      var $dialog = $('#calendarurlbox').dialog('close');
+      var $dialog = $('#calendarurlbox');
+
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
 
       if (calendar.feedurl) {
         $dialog.dialog({
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index aaa017d..0954ad1 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -853,7 +853,10 @@ function rcube_tasklist_ui(settings)
      */
     function task_show_dialog(id)
     {
-        var $dialog = $('#taskshow').dialog('close'), rec;;
+        var $dialog = $('#taskshow'), rec;
+
+        if ($dialog.is(':ui-dialog'))
+          $dialog.dialog('close');
 
         if (!(rec = listdata[id]) || clear_popups({}))
             return;
@@ -923,7 +926,7 @@ function rcube_tasklist_ui(settings)
      */
     function task_edit_dialog(id, action, presets)
     {
-        $('#taskshow').dialog('close');
+        $('#taskshow:ui-dialog').dialog('close');
 
         var rec = listdata[id] || presets,
             $dialog = $('<div>'),
@@ -1315,9 +1318,12 @@ function rcube_tasklist_ui(settings)
     function list_edit_dialog(id)
     {
         var list = me.tasklists[id],
-            $dialog = $('#tasklistform').dialog('close');
+            $dialog = $('#tasklistform');
             editform = $('#tasklisteditform');
 
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+
         if (!list)
             list = { name:'', editable:true, showalarms:true };