From f64dbf530381ad947e58a30e721a8b2cbd70f864 Mon Sep 17 00:00:00 2001
From: lavigor <lavigor@users.noreply.github.com>
Date: Tue, 14 Aug 2018 02:47:16 +0300
Subject: [PATCH] [ticket/13713] Fix multiple dropdown issues

PHPBB3-13713
---
 phpBB/adm/style/admin.css                 | 4 ++--
 phpBB/assets/javascript/editor.js         | 4 ++--
 phpBB/styles/prosilver/theme/mentions.css | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f9d5c8257f..7afffed2de 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1686,7 +1686,6 @@ fieldset.submit-buttons legend {
 		0 1px 5px 0 rgba(0, 0, 0, 0.12);
 	position: absolute;
 	z-index: 999;
-	overflow: auto;
 	transition: all 0.2s ease;
 }
 
@@ -1695,6 +1694,8 @@ fieldset.submit-buttons legend {
 }
 
 .atwho-view-ul { /* mention-list */
+	overflow: auto;
+	max-height: 200px;
 	margin: 0;
 	padding: 0;
 	list-style-type: none;
@@ -1736,7 +1737,6 @@ svg.mention-media-avatar { /* TODO: remove it after general normalization */
 	overflow: hidden;
 	justify-content: flex-start;
 	align-items: center;
-	max-width: 300px;
 	padding: 16px;
 	cursor: pointer;
 }
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index 9a05b0a458..d57cb7ed51 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -443,7 +443,7 @@ function getCaretPosition(txtarea) {
 			}
 
 			let cachedKeyword = getCachedKeyword(query),
-				cachedNamesForQuery = (cachedKeyword) ? cachedNames[cachedKeyword] : null;
+				cachedNamesForQuery = (cachedKeyword != null) ? cachedNames[cachedKeyword] : null;
 
 			/*
 			* Use cached values when we can:
@@ -465,7 +465,7 @@ function getCaretPosition(txtarea) {
 			$.getJSON(mentionURL, params, function(data) {
 				cachedNames[query] = data.names;
 				cachedAll[query] = data.all;
-				callback(data);
+				callback(data.names);
 			}).always(function() {
 				queryInProgress = null;
 			});
diff --git a/phpBB/styles/prosilver/theme/mentions.css b/phpBB/styles/prosilver/theme/mentions.css
index 262e83eecf..b3d9950f28 100644
--- a/phpBB/styles/prosilver/theme/mentions.css
+++ b/phpBB/styles/prosilver/theme/mentions.css
@@ -18,11 +18,12 @@
 	border-radius: 2px;
 	position: absolute;
 	z-index: 999;
-	overflow: auto;
 	transition: all 0.2s ease;
 }
 
 .atwho-view-ul { /* mention-list */
+	overflow: auto;
+	max-height: 200px;
 	margin: 0;
 	padding: 0;
 	list-style-type: none;
@@ -57,7 +58,6 @@ svg.mention-media-avatar { /* TODO: remove it after general normalization */
 	overflow: hidden;
 	justify-content: flex-start;
 	align-items: center;
-	max-width: 300px;
 	padding: 16px;
 	cursor: pointer;
 }