From b66d298dde41539ce36eb30b90701ef52bb66ff3 Mon Sep 17 00:00:00 2001
From: lavigor <lavigor@users.noreply.github.com>
Date: Sat, 16 Jun 2018 20:52:09 +0300
Subject: [PATCH] [ticket/13713] Use format buttons div as mentions data
 container

PHPBB3-13713
---
 phpBB/adm/style/acp_posting_buttons.html             | 5 +----
 phpBB/assets/javascript/editor.js                    | 8 ++++----
 phpBB/styles/prosilver/template/posting_buttons.html | 5 +----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html
index 74ebc88d78..5398726da7 100644
--- a/phpBB/adm/style/acp_posting_buttons.html
+++ b/phpBB/adm/style/acp_posting_buttons.html
@@ -8,15 +8,12 @@
 // ]]>
 </script>
 
-<!-- IF S_ALLOW_MENTIONS -->
-<div id="mention_params" style="display: none;" data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}"></div>
-<!-- ENDIF -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.caret.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.atwho.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <!-- EVENT acp_posting_buttons_before -->
-<div id="format-buttons">
+<div id="format-buttons"<!-- IF S_ALLOW_MENTIONS --> data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}"<!-- ENDIF -->>
 	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
 	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
 	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index f96ccbbd01..10dbc18935 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -386,10 +386,10 @@ function getCaretPosition(txtarea) {
 
 (function($) {
 	function handle_mentions(txtarea) {
-		var $mentionParams = $('#mention_params'),
-			mentionURL = $mentionParams.data('mentionUrl'),
-			mentionNamesLimit = $mentionParams.data('mentionNamesLimit'),
-			mentionTopicId = $mentionParams.data('topicId');
+		var $mentionDataContainer = $('#format-buttons'),
+			mentionURL = $mentionDataContainer.data('mentionUrl'),
+			mentionNamesLimit = $mentionDataContainer.data('mentionNamesLimit'),
+			mentionTopicId = $mentionDataContainer.data('topicId');
 		$(txtarea).atwho({
 			at: "@",
 			displayTpl: function(data) {
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 73b3159349..5765a29dca 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -26,9 +26,6 @@
 	}
 </script>
 
-<!-- IF S_ALLOW_MENTIONS -->
-<div id="mention_params" style="display: none;" data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}"></div>
-<!-- ENDIF -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.caret.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.atwho.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
@@ -42,7 +39,7 @@
 </div>
 
 <!-- EVENT posting_editor_buttons_before -->
-<div id="format-buttons" class="format-buttons">
+<div id="format-buttons" class="format-buttons"<!-- IF S_ALLOW_MENTIONS --> data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}"<!-- ENDIF -->>
 	<button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
 		{{ Icon('iconify', 'mdi:format-bold', '', true, 'c-button-icon') }}
 	</button>