From c602c002c6a1d66877c9e0e54feff50d5e5baf22 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 15 Jul 2019 13:15:13 +0000
Subject: [PATCH] Fix hiding of tag related UI elements when kolab_tags plugin
 is not enabled

---
 plugins/kolab_notes/notes.js |  8 ++++++--
 plugins/tasklist/tasklist.js | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index d0866f15..2af79ef9 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -770,9 +770,13 @@ function rcube_kolab_notes_ui(settings)
             is_html = false;
 
         // tag-edit line
+        var tagline = $('.tagline', titlecontainer);
         if (window.kolab_tags_input) {
-            $('.tagline', titlecontainer).parent('.form-group').show();
-            taglist = kolab_tags_input($('.tagline', titlecontainer), data.tags, readonly);
+            tagline.parent('.form-group').show();
+            taglist = kolab_tags_input(tagline, data.tags, readonly);
+        }
+        else {
+            tagline.parent('.form-group').hide();
         }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index d93c6992..cae76516 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -2398,8 +2398,8 @@ function rcube_tasklist_ui(settings)
     function task_edit_dialog(id, action, presets)
     {
         var elastic = false, infodialog = $('#taskshow');
-        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
 
+        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
             elastic = true;
             infodialog.addClass('hidden').parent().addClass('watermark'); // Elastic
         }
@@ -2479,9 +2479,13 @@ function rcube_tasklist_ui(settings)
         tasklist.val(rec.list || me.selected_list || selected_list);
 
         // tag-edit line
+        var tagline = $('#taskedit-tagline');
         if (window.kolab_tags_input) {
-            $('#taskedit-tagline').parent('.form-group').show();
-            taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+            tagline.parent().show();
+            taglist = kolab_tags_input(tagline, rec.tags, readonly);
+        }
+        else {
+            tagline.parent().hide();
         }
 
         // set alarm(s)