From 592163d83d0da4c12e1a4558e9759e8d25995409 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 27 Mar 2017 13:07:24 +0200
Subject: [PATCH] Fix unavailable comment field on itip-append page

---
 .../libcalendaring/lib/libcalendaring_itip.php | 18 +++++++++++++++---
 plugins/libcalendaring/libcalendaring.js       |  5 -----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index 929b0967..c6eef240 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -721,10 +721,22 @@ class libcalendaring_itip
         }
 
         // add input field for reply comment
-        $rsvp_additions .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
-        $rsvp_additions .= html::div('itip-reply-comment',
-            html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'name' => '_comment', 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
+        $toggle_attrib = array(
+            'href'    => '#toggle',
+            'class'   => 'reply-comment-toggle',
+            'onclick' => '$(this).hide().parent().find(\'textarea\').show().focus()'
         );
+        $textarea_attrib = array(
+            'id'    => 'reply-comment-' . $dom_id,
+            'name'  => '_comment',
+            'cols'  => 40,
+            'rows'  => 6,
+            'style' => 'display:none',
+            'placeholder' => $this->gettext('itipcomment')
+        );
+
+        $rsvp_additions .= html::a($toggle_attrib, $this->gettext('itipeditresponse'))
+            . html::div('itip-reply-comment', html::tag('textarea', $textarea_attrib, ''));
 
         return $rsvp_additions;
     }
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 2836986b..985271e1 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -1381,11 +1381,6 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     .addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status)
     .addEventListener('plugin.itip_message_processed', rcube_libcalendaring.itip_message_processed);
 
-  $('.rsvp-buttons').on('click', 'a.reply-comment-toggle', function(e){
-    $(this).hide().parent().find('textarea').show().focus();
-    return false;
-  });
-
   if (rcmail.env.action == 'get-attachment' && rcmail.gui_objects['attachmentframe']) {
     rcmail.register_command('print-attachment', function() {
       var frame = rcmail.get_frame_window(rcmail.gui_objects['attachmentframe'].id);