From 689368cdd7e49d61bd1f2faf6a5204747273d3f5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 7 Mar 2018 10:57:29 +0100
Subject: [PATCH] Fix feedback for markdown toolbar and cke toolbar

---
 www/common/common-ui-elements.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index de550dc0c..4c6fd1295 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -464,6 +464,7 @@ define([
         var AppConfig = common.getAppConfig();
         var button;
         var sframeChan = common.getSframeChannel();
+        var appType = (common.getMetadataMgr().getMetadata().type || 'pad').toUpperCase();
         switch (type) {
             case 'export':
                 button = $('<button>', {
@@ -656,8 +657,7 @@ define([
             case 'toggle':
                 button = $('<button>', {
                     'class': 'fa fa-caret-down cp-toolbar-icon-toggle',
-                })
-                .click(common.prepareFeedback(type));
+                });
                 window.setTimeout(function () {
                     button.attr('title', data.title);
                 });
@@ -666,14 +666,16 @@ define([
                     if (!isVisible) { button.addClass('fa-caret-down'); }
                     else { button.addClass('fa-caret-up'); }
                 };
-                button.click(function () {
+                button.click(function (e) {
                     data.element.toggle();
                     var isVisible = data.element.is(':visible');
                     if (callback) { callback(isVisible); }
                     if (isVisible) {
                         button.addClass('cp-toolbar-button-active');
+                        if (e.originalEvent) { Feedback.send('TOGGLE_SHOW_' + appType); }
                     } else {
                         button.removeClass('cp-toolbar-button-active');
+                        if (e.originalEvent) { Feedback.send('TOGGLE_HIDE_' + appType); }
                     }
                     updateIcon(isVisible);
                 });
@@ -702,7 +704,7 @@ define([
                 button = $('<button>', {
                     'class': "fa " + icon,
                 })
-                .click(common.prepareFeedback(type));
+                .click(common.prepareFeedback(data.name || 'DEFAULT'));
                 if (data.title) { button.attr('title', data.title); }
                 if (data.style) { button.attr('style', data.style); }
                 if (data.id) { button.attr('id', data.id); }