From ee2d1f806db957bec0dcdb0155d6c165fb18ed24 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Sat, 8 Oct 2022 00:50:50 +0800 Subject: [PATCH] MDL-75513 message: Enable optional text display in the contact toggle --- .../amd/build/toggle_contact_button.min.js | 2 +- .../build/toggle_contact_button.min.js.map | 2 +- message/amd/src/toggle_contact_button.js | 21 +++++++++++++++++-- message/classes/helper.php | 4 +++- message/templates/add_contact_button.mustache | 7 ++++--- .../templates/remove_contact_button.mustache | 7 ++++--- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/message/amd/build/toggle_contact_button.min.js b/message/amd/build/toggle_contact_button.min.js index c07297dd275..d4e3aa74795 100644 --- a/message/amd/build/toggle_contact_button.min.js +++ b/message/amd/build/toggle_contact_button.min.js @@ -5,6 +5,6 @@ * @copyright 2016 Ryan Wyllie * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -define("core_message/toggle_contact_button",["jquery","core/ajax","core/templates","core/notification","core/custom_interaction_events"],(function($,Ajax,Templates,Notification,CustomEvents){var getUserId=function(element){return element.attr("data-userid")},getCurrentUserId=function(element){return element.attr("data-currentuserid")},isLoading=function(element){return element.hasClass("loading")||element.attr("disabled")},sendRequest=function(element,request){return isLoading(element)?$.Deferred():(element.addClass("loading"),element.attr("disabled","disabled"),Ajax.call([request])[0].fail(Notification.exception).always((function(){element.removeClass("loading"),element.removeAttr("disabled")})))};return{enhance:function(element){(element=$(element)).children(".loading-icon").length||Templates.render("core/loading",{}).done((function(html,js){element.append(html,js)})),CustomEvents.define(element,[CustomEvents.events.activate]),element.on(CustomEvents.events.activate,(function(e,data){!function(element){return"1"==element.attr("data-is-contact")}(element)?function(element){if(!isLoading(element)){var request={methodname:"core_message_create_contact_request",args:{userid:getCurrentUserId(element),requesteduserid:getUserId(element)}};sendRequest(element,request).done((function(){!function(element){element.attr("data-is-contact","1")}(element),Templates.render("message/remove_contact_button",{}).done((function(html,js){Templates.replaceNodeContents(element,html,js)}))}))}}(element):function(element){if(!isLoading(element)){var request={methodname:"core_message_delete_contacts",args:{userids:[getUserId(element)]}};sendRequest(element,request).done((function(){!function(element){element.attr("data-is-contact","0")}(element),Templates.render("message/add_contact_button",{}).done((function(html,js){Templates.replaceNodeContents(element,html,js)}))}))}}(element),e.preventDefault(),data.originalEvent.preventDefault()}))}}})); +define("core_message/toggle_contact_button",["jquery","core/ajax","core/templates","core/notification","core/custom_interaction_events"],(function($,Ajax,Templates,Notification,CustomEvents){var getUserId=function(element){return element.attr("data-userid")},getCurrentUserId=function(element){return element.attr("data-currentuserid")},displayTextLabel=function(element){return"1"==element.attr("data-display-text-label")},isLoading=function(element){return element.hasClass("loading")||element.attr("disabled")},sendRequest=function(element,request){return isLoading(element)?$.Deferred():(element.addClass("loading"),element.attr("disabled","disabled"),Ajax.call([request])[0].fail(Notification.exception).always((function(){element.removeClass("loading"),element.removeAttr("disabled")})))};return{enhance:function(element){(element=$(element)).children(".loading-icon").length||Templates.render("core/loading",{}).done((function(html,js){element.append(html,js)})),CustomEvents.define(element,[CustomEvents.events.activate]),element.on(CustomEvents.events.activate,(function(e,data){!function(element){return"1"==element.attr("data-is-contact")}(element)?function(element){if(!isLoading(element)){var request={methodname:"core_message_create_contact_request",args:{userid:getCurrentUserId(element),requesteduserid:getUserId(element)}};sendRequest(element,request).done((function(){!function(element){element.attr("data-is-contact","1")}(element);const templateContext={displaytextlabel:displayTextLabel(element)};Templates.render("message/remove_contact_button",templateContext).done((function(html,js){Templates.replaceNodeContents(element,html,js)}))}))}}(element):function(element){if(!isLoading(element)){var request={methodname:"core_message_delete_contacts",args:{userids:[getUserId(element)]}};sendRequest(element,request).done((function(){!function(element){element.attr("data-is-contact","0")}(element);const templateContext={displaytextlabel:displayTextLabel(element)};Templates.render("message/add_contact_button",templateContext).done((function(html,js){Templates.replaceNodeContents(element,html,js)}))}))}}(element),e.preventDefault(),data.originalEvent.preventDefault()}))}}})); //# sourceMappingURL=toggle_contact_button.min.js.map \ No newline at end of file diff --git a/message/amd/build/toggle_contact_button.min.js.map b/message/amd/build/toggle_contact_button.min.js.map index bf7a37f9b8d..2760ca1ea6d 100644 --- a/message/amd/build/toggle_contact_button.min.js.map +++ b/message/amd/build/toggle_contact_button.min.js.map @@ -1 +1 @@ -{"version":3,"file":"toggle_contact_button.min.js","sources":["../src/toggle_contact_button.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * Module to add/remove contact using ajax.\n *\n * @module core_message/toggle_contact_button\n * @copyright 2016 Ryan Wyllie \n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/custom_interaction_events'],\n function($, Ajax, Templates, Notification, CustomEvents) {\n\n /**\n * Check the state of the element, if the current user is a contact or not.\n *\n * @method isContact\n * @param {object} element jQuery object for the button\n * @return {bool}\n */\n var isContact = function(element) {\n return element.attr('data-is-contact') == '1';\n };\n\n /**\n * Record that the user is a contact.\n *\n * @method setContact\n * @param {object} element jQuery object for the button\n */\n var setContact = function(element) {\n element.attr('data-is-contact', '1');\n };\n\n /**\n * Record that the user is not a contact.\n *\n * @method setNotContact\n * @param {object} element jQuery object for the button\n */\n var setNotContact = function(element) {\n element.attr('data-is-contact', '0');\n };\n\n /**\n * Get the id for the user being viewed.\n *\n * @method getUserId\n * @param {object} element jQuery object for the button\n * @return {int}\n */\n var getUserId = function(element) {\n return element.attr('data-userid');\n };\n\n /**\n * Get the id for the logged in user.\n *\n * @method getUserId\n * @param {object} element jQuery object for the button\n * @return {int}\n */\n var getCurrentUserId = function(element) {\n return element.attr('data-currentuserid');\n };\n\n /**\n * Check if this element is currently loading.\n *\n * @method isLoading\n * @param {object} element jQuery object for the button\n * @return {bool}\n */\n var isLoading = function(element) {\n return element.hasClass('loading') || element.attr('disabled');\n };\n\n /**\n * Sends an ajax request to the server and handles the element state\n * while the request is being performed.\n *\n * @method sendRequest\n * @param {object} element jQuery object for the button\n * @param {object} request Request hash to send\n * @return {object} jQuery promise\n */\n var sendRequest = function(element, request) {\n if (isLoading(element)) {\n return $.Deferred();\n }\n\n element.addClass('loading');\n element.attr('disabled', 'disabled');\n\n return Ajax.call([request])[0]\n .fail(Notification.exception)\n .always(function() {\n element.removeClass('loading');\n element.removeAttr('disabled');\n });\n };\n\n /**\n * Send a request to the server to add the current user as\n * a contact. The contents of the button are changed to the\n * remove contact button upon success.\n *\n * @method addContact\n * @param {object} element jQuery object for the button\n */\n var addContact = function(element) {\n if (isLoading(element)) {\n return;\n }\n\n var request = {\n methodname: 'core_message_create_contact_request',\n args: {\n userid: getCurrentUserId(element),\n requesteduserid: getUserId(element),\n }\n };\n sendRequest(element, request).done(function() {\n setContact(element);\n Templates.render('message/remove_contact_button', {}).done(function(html, js) {\n Templates.replaceNodeContents(element, html, js);\n });\n });\n };\n\n /**\n * Send a request to the server to remove the current user as\n * a contact. The contents of the button are changed to the\n * add contact button upon success.\n *\n * @method removeContact\n * @param {object} element jQuery object for the button\n */\n var removeContact = function(element) {\n if (isLoading(element)) {\n return;\n }\n\n var request = {\n methodname: 'core_message_delete_contacts',\n args: {\n userids: [getUserId(element)],\n }\n };\n\n sendRequest(element, request).done(function() {\n setNotContact(element);\n Templates.render('message/add_contact_button', {}).done(function(html, js) {\n Templates.replaceNodeContents(element, html, js);\n });\n });\n };\n\n /**\n * Enhances the given element with a loading gif and event handles to make\n * ajax requests to add or remove a contact where appropriate.\n *\n * @public\n * @method enhance\n * @param {object} element jQuery object for the button\n */\n var enhance = function(element) {\n element = $(element);\n\n if (!element.children('.loading-icon').length) {\n // Add the loading gif if it isn't already there.\n Templates.render('core/loading', {}).done(function(html, js) {\n element.append(html, js);\n });\n }\n\n CustomEvents.define(element, [CustomEvents.events.activate]);\n\n element.on(CustomEvents.events.activate, function(e, data) {\n if (isContact(element)) {\n removeContact(element);\n } else {\n addContact(element);\n }\n e.preventDefault();\n data.originalEvent.preventDefault();\n });\n };\n\n return {\n enhance: enhance\n };\n});\n"],"names":["define","$","Ajax","Templates","Notification","CustomEvents","getUserId","element","attr","getCurrentUserId","isLoading","hasClass","sendRequest","request","Deferred","addClass","call","fail","exception","always","removeClass","removeAttr","enhance","children","length","render","done","html","js","append","events","activate","on","e","data","isContact","methodname","args","userid","requesteduserid","setContact","replaceNodeContents","addContact","userids","setNotContact","removeContact","preventDefault","originalEvent"],"mappings":";;;;;;;AAsBAA,4CAAO,CAAC,SAAU,YAAa,iBAAkB,oBAAqB,mCAC9D,SAASC,EAAGC,KAAMC,UAAWC,aAAcC,kBAwC3CC,UAAY,SAASC,gBACdA,QAAQC,KAAK,gBAUpBC,iBAAmB,SAASF,gBACrBA,QAAQC,KAAK,uBAUpBE,UAAY,SAASH,gBACdA,QAAQI,SAAS,YAAcJ,QAAQC,KAAK,aAYnDI,YAAc,SAASL,QAASM,gBAC5BH,UAAUH,SACHN,EAAEa,YAGbP,QAAQQ,SAAS,WACjBR,QAAQC,KAAK,WAAY,YAElBN,KAAKc,KAAK,CAACH,UAAU,GACvBI,KAAKb,aAAac,WAClBC,QAAO,WACJZ,QAAQa,YAAY,WACpBb,QAAQc,WAAW,uBA2FxB,CACHC,QAxBU,SAASf,UACnBA,QAAUN,EAAEM,UAECgB,SAAS,iBAAiBC,QAEnCrB,UAAUsB,OAAO,eAAgB,IAAIC,MAAK,SAASC,KAAMC,IACrDrB,QAAQsB,OAAOF,KAAMC,OAI7BvB,aAAaL,OAAOO,QAAS,CAACF,aAAayB,OAAOC,WAElDxB,QAAQyB,GAAG3B,aAAayB,OAAOC,UAAU,SAASE,EAAGC,OA9JzC,SAAS3B,eACqB,KAAnCA,QAAQC,KAAK,mBA8JZ2B,CAAU5B,SArEL,SAASA,aAClBG,UAAUH,cAIVM,QAAU,CACVuB,WAAY,sCACZC,KAAM,CACFC,OAAQ7B,iBAAiBF,SACzBgC,gBAAiBjC,UAAUC,WAGnCK,YAAYL,QAASM,SAASa,MAAK,YA5FtB,SAASnB,SACtBA,QAAQC,KAAK,kBAAmB,KA4F5BgC,CAAWjC,SACXJ,UAAUsB,OAAO,gCAAiC,IAAIC,MAAK,SAASC,KAAMC,IACtEzB,UAAUsC,oBAAoBlC,QAASoB,KAAMC,WAyD7Cc,CAAWnC,SA5CH,SAASA,aACrBG,UAAUH,cAIVM,QAAU,CACVuB,WAAY,+BACZC,KAAM,CACFM,QAAS,CAACrC,UAAUC,YAI5BK,YAAYL,QAASM,SAASa,MAAK,YA9GnB,SAASnB,SACzBA,QAAQC,KAAK,kBAAmB,KA8G5BoC,CAAcrC,SACdJ,UAAUsB,OAAO,6BAA8B,IAAIC,MAAK,SAASC,KAAMC,IACnEzB,UAAUsC,oBAAoBlC,QAASoB,KAAMC,WA2B7CiB,CAActC,SAIlB0B,EAAEa,iBACFZ,KAAKa,cAAcD"} \ No newline at end of file +{"version":3,"file":"toggle_contact_button.min.js","sources":["../src/toggle_contact_button.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * Module to add/remove contact using ajax.\n *\n * @module core_message/toggle_contact_button\n * @copyright 2016 Ryan Wyllie \n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/custom_interaction_events'],\n function($, Ajax, Templates, Notification, CustomEvents) {\n\n /**\n * Check the state of the element, if the current user is a contact or not.\n *\n * @method isContact\n * @param {object} element jQuery object for the button\n * @return {bool}\n */\n var isContact = function(element) {\n return element.attr('data-is-contact') == '1';\n };\n\n /**\n * Record that the user is a contact.\n *\n * @method setContact\n * @param {object} element jQuery object for the button\n */\n var setContact = function(element) {\n element.attr('data-is-contact', '1');\n };\n\n /**\n * Record that the user is not a contact.\n *\n * @method setNotContact\n * @param {object} element jQuery object for the button\n */\n var setNotContact = function(element) {\n element.attr('data-is-contact', '0');\n };\n\n /**\n * Get the id for the user being viewed.\n *\n * @method getUserId\n * @param {object} element jQuery object for the button\n * @return {int}\n */\n var getUserId = function(element) {\n return element.attr('data-userid');\n };\n\n /**\n * Get the id for the logged in user.\n *\n * @method getUserId\n * @param {object} element jQuery object for the button\n * @return {int}\n */\n var getCurrentUserId = function(element) {\n return element.attr('data-currentuserid');\n };\n\n /**\n * Check whether a text label should be displayed or not.\n *\n * @method getUserId\n * @param {object} element jQuery object for the button\n * @return {int}\n */\n var displayTextLabel = function(element) {\n return element.attr('data-display-text-label') == '1';\n };\n\n /**\n * Check if this element is currently loading.\n *\n * @method isLoading\n * @param {object} element jQuery object for the button\n * @return {bool}\n */\n var isLoading = function(element) {\n return element.hasClass('loading') || element.attr('disabled');\n };\n\n /**\n * Sends an ajax request to the server and handles the element state\n * while the request is being performed.\n *\n * @method sendRequest\n * @param {object} element jQuery object for the button\n * @param {object} request Request hash to send\n * @return {object} jQuery promise\n */\n var sendRequest = function(element, request) {\n if (isLoading(element)) {\n return $.Deferred();\n }\n\n element.addClass('loading');\n element.attr('disabled', 'disabled');\n\n return Ajax.call([request])[0]\n .fail(Notification.exception)\n .always(function() {\n element.removeClass('loading');\n element.removeAttr('disabled');\n });\n };\n\n /**\n * Send a request to the server to add the current user as\n * a contact. The contents of the button are changed to the\n * remove contact button upon success.\n *\n * @method addContact\n * @param {object} element jQuery object for the button\n */\n var addContact = function(element) {\n if (isLoading(element)) {\n return;\n }\n\n var request = {\n methodname: 'core_message_create_contact_request',\n args: {\n userid: getCurrentUserId(element),\n requesteduserid: getUserId(element),\n }\n };\n sendRequest(element, request).done(function() {\n setContact(element);\n const templateContext = {\n 'displaytextlabel': displayTextLabel(element)\n };\n Templates.render('message/remove_contact_button', templateContext).done(function(html, js) {\n Templates.replaceNodeContents(element, html, js);\n });\n });\n };\n\n /**\n * Send a request to the server to remove the current user as\n * a contact. The contents of the button are changed to the\n * add contact button upon success.\n *\n * @method removeContact\n * @param {object} element jQuery object for the button\n */\n var removeContact = function(element) {\n if (isLoading(element)) {\n return;\n }\n\n var request = {\n methodname: 'core_message_delete_contacts',\n args: {\n userids: [getUserId(element)],\n }\n };\n\n sendRequest(element, request).done(function() {\n setNotContact(element);\n const templateContext = {\n 'displaytextlabel': displayTextLabel(element)\n };\n Templates.render('message/add_contact_button', templateContext).done(function(html, js) {\n Templates.replaceNodeContents(element, html, js);\n });\n });\n };\n\n /**\n * Enhances the given element with a loading gif and event handles to make\n * ajax requests to add or remove a contact where appropriate.\n *\n * @public\n * @method enhance\n * @param {object} element jQuery object for the button\n */\n var enhance = function(element) {\n element = $(element);\n\n if (!element.children('.loading-icon').length) {\n // Add the loading gif if it isn't already there.\n Templates.render('core/loading', {}).done(function(html, js) {\n element.append(html, js);\n });\n }\n\n CustomEvents.define(element, [CustomEvents.events.activate]);\n\n element.on(CustomEvents.events.activate, function(e, data) {\n if (isContact(element)) {\n removeContact(element);\n } else {\n addContact(element);\n }\n e.preventDefault();\n data.originalEvent.preventDefault();\n });\n };\n\n return {\n enhance: enhance\n };\n});\n"],"names":["define","$","Ajax","Templates","Notification","CustomEvents","getUserId","element","attr","getCurrentUserId","displayTextLabel","isLoading","hasClass","sendRequest","request","Deferred","addClass","call","fail","exception","always","removeClass","removeAttr","enhance","children","length","render","done","html","js","append","events","activate","on","e","data","isContact","methodname","args","userid","requesteduserid","setContact","templateContext","replaceNodeContents","addContact","userids","setNotContact","removeContact","preventDefault","originalEvent"],"mappings":";;;;;;;AAsBAA,4CAAO,CAAC,SAAU,YAAa,iBAAkB,oBAAqB,mCAC9D,SAASC,EAAGC,KAAMC,UAAWC,aAAcC,kBAwC3CC,UAAY,SAASC,gBACdA,QAAQC,KAAK,gBAUpBC,iBAAmB,SAASF,gBACrBA,QAAQC,KAAK,uBAUpBE,iBAAmB,SAASH,eACsB,KAA3CA,QAAQC,KAAK,4BAUpBG,UAAY,SAASJ,gBACdA,QAAQK,SAAS,YAAcL,QAAQC,KAAK,aAYnDK,YAAc,SAASN,QAASO,gBAC5BH,UAAUJ,SACHN,EAAEc,YAGbR,QAAQS,SAAS,WACjBT,QAAQC,KAAK,WAAY,YAElBN,KAAKe,KAAK,CAACH,UAAU,GACvBI,KAAKd,aAAae,WAClBC,QAAO,WACJb,QAAQc,YAAY,WACpBd,QAAQe,WAAW,uBAiGxB,CACHC,QAxBU,SAAShB,UACnBA,QAAUN,EAAEM,UAECiB,SAAS,iBAAiBC,QAEnCtB,UAAUuB,OAAO,eAAgB,IAAIC,MAAK,SAASC,KAAMC,IACrDtB,QAAQuB,OAAOF,KAAMC,OAI7BxB,aAAaL,OAAOO,QAAS,CAACF,aAAa0B,OAAOC,WAElDzB,QAAQ0B,GAAG5B,aAAa0B,OAAOC,UAAU,SAASE,EAAGC,OA/KzC,SAAS5B,eACqB,KAAnCA,QAAQC,KAAK,mBA+KZ4B,CAAU7B,SA3EL,SAASA,aAClBI,UAAUJ,cAIVO,QAAU,CACVuB,WAAY,sCACZC,KAAM,CACFC,OAAQ9B,iBAAiBF,SACzBiC,gBAAiBlC,UAAUC,WAGnCM,YAAYN,QAASO,SAASa,MAAK,YAvGtB,SAASpB,SACtBA,QAAQC,KAAK,kBAAmB,KAuG5BiC,CAAWlC,eACLmC,gBAAkB,kBACAhC,iBAAiBH,UAEzCJ,UAAUuB,OAAO,gCAAiCgB,iBAAiBf,MAAK,SAASC,KAAMC,IACnF1B,UAAUwC,oBAAoBpC,QAASqB,KAAMC,WA4D7Ce,CAAWrC,SA/CH,SAASA,aACrBI,UAAUJ,cAIVO,QAAU,CACVuB,WAAY,+BACZC,KAAM,CACFO,QAAS,CAACvC,UAAUC,YAI5BM,YAAYN,QAASO,SAASa,MAAK,YA5HnB,SAASpB,SACzBA,QAAQC,KAAK,kBAAmB,KA4H5BsC,CAAcvC,eACRmC,gBAAkB,kBACAhC,iBAAiBH,UAEzCJ,UAAUuB,OAAO,6BAA8BgB,iBAAiBf,MAAK,SAASC,KAAMC,IAChF1B,UAAUwC,oBAAoBpC,QAASqB,KAAMC,WA2B7CkB,CAAcxC,SAIlB2B,EAAEc,iBACFb,KAAKc,cAAcD"} \ No newline at end of file diff --git a/message/amd/src/toggle_contact_button.js b/message/amd/src/toggle_contact_button.js index 4490494c0cc..9ece821944f 100644 --- a/message/amd/src/toggle_contact_button.js +++ b/message/amd/src/toggle_contact_button.js @@ -76,6 +76,17 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust return element.attr('data-currentuserid'); }; + /** + * Check whether a text label should be displayed or not. + * + * @method getUserId + * @param {object} element jQuery object for the button + * @return {int} + */ + var displayTextLabel = function(element) { + return element.attr('data-display-text-label') == '1'; + }; + /** * Check if this element is currently loading. * @@ -134,7 +145,10 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust }; sendRequest(element, request).done(function() { setContact(element); - Templates.render('message/remove_contact_button', {}).done(function(html, js) { + const templateContext = { + 'displaytextlabel': displayTextLabel(element) + }; + Templates.render('message/remove_contact_button', templateContext).done(function(html, js) { Templates.replaceNodeContents(element, html, js); }); }); @@ -162,7 +176,10 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust sendRequest(element, request).done(function() { setNotContact(element); - Templates.render('message/add_contact_button', {}).done(function(html, js) { + const templateContext = { + 'displaytextlabel': displayTextLabel(element) + }; + Templates.render('message/add_contact_button', templateContext).done(function(html, js) { Templates.replaceNodeContents(element, html, js); }); }); diff --git a/message/classes/helper.php b/message/classes/helper.php index 1396d8f38c9..9a66ca2eddc 100644 --- a/message/classes/helper.php +++ b/message/classes/helper.php @@ -308,14 +308,16 @@ class helper { * * @param object $user User object. * @param bool $iscontact + * @param bool $displaytextlabel Instructs whether to display a text label. * @return array */ - public static function togglecontact_link_params($user, $iscontact = false) { + public static function togglecontact_link_params($user, $iscontact = false, bool $displaytextlabel = true) { global $USER; $params = array( 'data-currentuserid' => $USER->id, 'data-userid' => $user->id, 'data-is-contact' => $iscontact, + 'data-display-text-label' => $displaytextlabel, 'id' => 'toggle-contact-button', 'role' => 'button', 'class' => 'ajax-contact-button', diff --git a/message/templates/add_contact_button.mustache b/message/templates/add_contact_button.mustache index c06d6614817..f4972a58d98 100644 --- a/message/templates/add_contact_button.mustache +++ b/message/templates/add_contact_button.mustache @@ -20,14 +20,15 @@ Template for the contents of the add contact button on the user's profile page. Context variables required for this template: - * none + * displaytextlabel - Whether to display text next to the action icon. Example context (json): { + "displaytextlabel": true } }} - {{#pix}} t/addcontact, core {{/pix}} - {{#str}} addtoyourcontacts, message {{/str}} + {{#pix}} t/addcontact, core, {{#str}} addtoyourcontacts, message {{/str}} {{/pix}} + {{#displaytextlabel}}{{#str}} addtoyourcontacts, message {{/str}}{{/displaytextlabel}} {{> core/loading }} diff --git a/message/templates/remove_contact_button.mustache b/message/templates/remove_contact_button.mustache index 2f542f55c2a..70b9fda103b 100644 --- a/message/templates/remove_contact_button.mustache +++ b/message/templates/remove_contact_button.mustache @@ -20,14 +20,15 @@ Template for the contents of the add contact button on the user's profile page. Context variables required for this template: - * none + * displaytextlabel - Whether to display text next to the action icon. Example context (json): { + "displaytextlabel": true } }} - {{#pix}} t/removecontact, core {{/pix}} - {{#str}} removefromyourcontacts, message {{/str}} + {{#pix}} t/removecontact, core, {{#str}} removefromyourcontacts, message {{/str}} {{/pix}} + {{#displaytextlabel}}{{#str}} removefromyourcontacts, message {{/str}}{{/displaytextlabel}} {{> core/loading }}