From b8894f5ab28ed11511470773a15fc27833029f93 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 30 Jul 2017 10:18:23 +0000 Subject: [PATCH 1/2] Disable tagging functionality in contextmenu for Roundcube < 1.4 (Bifrost#T18460) --- plugins/kolab_tags/kolab_tags.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/kolab_tags/kolab_tags.js b/plugins/kolab_tags/kolab_tags.js index bfd61865..0f5fbb3e 100644 --- a/plugins/kolab_tags/kolab_tags.js +++ b/plugins/kolab_tags/kolab_tags.js @@ -60,6 +60,17 @@ window.rcmail && rcmail.addEventListener('init', function() { rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); }); rcmail.register_command('tag-remove-all', function() { tag_remove('*'); }); + // Disable tag functionality in contextmenu in Roundcube < 1.4 + if (!rcmail.env.rcversion) { + rcmail.addEventListener('menu-open', function(e) { + if (e.name == 'rcm_markmessagemenu') { + $.each(['add', 'remove', 'remove-all'], function() { + $('a.cmd_tag-' + this).parent().hide(); + }); + } + }); + } + // ajax response handler rcmail.addEventListener('plugin.kolab_tags', update_tags); From 1ea20a65c2bc27a161e7caaf1ebe53556037fef5 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 30 Jul 2017 10:39:18 +0000 Subject: [PATCH 2/2] Load missing 'showmore' label localization --- plugins/libcalendaring/libcalendaring.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php index 8a7de9b2..1053f8e9 100644 --- a/plugins/libcalendaring/libcalendaring.php +++ b/plugins/libcalendaring/libcalendaring.php @@ -137,7 +137,7 @@ class libcalendaring extends rcube_plugin 'statusorganizer', 'statusaccepted', 'statusdeclined', 'statusdelegated', 'statusunknown', 'statusneeds-action', 'statustentative', 'statuscompleted', 'statusin-process', - 'delegatedto', 'delegatedfrom' + 'delegatedto', 'delegatedfrom', 'showmore' ); }