2 commits - plugins/calendar plugins/libcalendaring

Thomas Brüderli bruederli at kolabsys.com
Wed Jan 7 13:01:21 CET 2015


 plugins/calendar/skins/larry/templates/calendar.html |    3 +++
 plugins/libcalendaring/libvcalendar.php              |    3 ++-
 plugins/libcalendaring/tests/libvcalendar.php        |    1 +
 plugins/libcalendaring/tests/resources/vtodo.ics     |    2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 17f57ff7caa1ec36bb0c780a59b6f9e26644a156
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jan 7 13:00:57 2015 +0100

    Accept parent-relation from RELATED-TO property without RELTYPE parameter (#4158)

diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index b94ceed..787ca72 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -453,7 +453,8 @@ class libvcalendar implements Iterator
                 break;
 
             case 'RELATED-TO':
-                if ($prop->offsetGet('RELTYPE') == 'PARENT') {
+                $reltype = $prop->offsetGet('RELTYPE');
+                if ($reltype == 'PARENT' || $reltype === null) {
                     $event['parent_id'] = $prop->value;
                 }
                 break;
diff --git a/plugins/libcalendaring/tests/libvcalendar.php b/plugins/libcalendaring/tests/libvcalendar.php
index ce4edea..bb0f121 100644
--- a/plugins/libcalendaring/tests/libvcalendar.php
+++ b/plugins/libcalendaring/tests/libvcalendar.php
@@ -322,6 +322,7 @@ class libvcalendar_test extends PHPUnit_Framework_TestCase
         $this->assertEquals('IN-PROCESS',   $task['status'],  "Task status property");
         $this->assertEquals(1, count($task['x-custom']),      "Custom properties");
         $this->assertEquals(4, count($task['categories']));
+        $this->assertEquals('1234567890-12345678-PARENT', $task['parent_id'], "Parent Relation");
     }
 
     /**
diff --git a/plugins/libcalendaring/tests/resources/vtodo.ics b/plugins/libcalendaring/tests/resources/vtodo.ics
index 0d4534c..746787d 100644
--- a/plugins/libcalendaring/tests/resources/vtodo.ics
+++ b/plugins/libcalendaring/tests/resources/vtodo.ics
@@ -31,6 +31,8 @@ SEQUENCE:2
 CATEGORIES:Tag1,Tag2
 CATEGORIES:Tag3
 CATEGORIES:Tag4
+RELATED-TO:1234567890-12345678-PARENT
+RELATED-TO;RELTYPE=CHILD:1234567890-12345678-CHILD
 X-MOZ-GENERATION:1
 BEGIN:VALARM
 ACTION:DISPLAY


commit ac4ed0ff1943a313a4098c54fadedb84b3cc30f2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jan 5 16:00:13 2015 +0100

    Remove focus from folder search toggle icon (#4062)

diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index 72e86c7..40a9873 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -377,6 +377,9 @@ $(document).ready(function(e){
 			box = $('#calendars .listsearchbox'),
 			dir = box.is(':visible') ? -1 : 1;
 
+		if (!rcube_event.is_keyboard(e))
+			$(this).blur();
+
 		box.slideToggle({
 			duration: 160,
 			progress: function(animation, progress) {




More information about the commits mailing list