fix ticket-0866

Author: g5bot

src/Public/static/js/default.js

@@ -60,9 +60,10 @@ function addUserContact(obj, userid) {
 	);
 }
 var clmodeswitchdiv = "";
-function showContactModeSwitcher(div, contactid) {
+function showContactModeSwitcher(element, div, contactid) {
 	clmodeswitchdiv = div;
-	updatePopup(
+	updatePopupAtElement(
+		element,
 		"/pm.php?SHOW_CONTACT_MODESWITCH=1&contactid=" + contactid,
 		70
 	);

src/html/macros.twig

@@ -123,16 +123,7 @@
 {% endmacro %}
 
 {% macro contactModeSwitcher(contact, div) %}
-{% if contact %}
-{% set mode = contact.getMode.value %}
-{% set description = contact.getMode.getTitle %}
-{% if div %}
-<span class="cltype{{ mode }}" id="contact{{ contact.getId }}"
-    onclick="showContactModeSwitcher('{{ div }}',{{ contact.getId }});">{{ description }}</span>
-{% else %}
-<span class="cltype{{ mode }}" style="cursor: auto;">{{ description }}</span>
-{% endif %}
-{% endif %}
+{% include 'html/user/contactMode.twig' %}
 {% endmacro %}
 
 {% macro translationSwitcher(hasTranslation, id, title) %}

src/html/user/contactMode.twig

@@ -5,7 +5,7 @@
 
 {% if div %}
 <span class="cltype{{ value }}" id="contact{{ contact.getId }}"
-    onclick="showContactModeSwitcher('{{ div }}', {{ contact.getId }});">{{ title }}</span>
+    onclick="showContactModeSwitcher(this, '{{ div }}', {{ contact.getId }});">{{ title }}</span>
 {% else %}
 <span class="cltype{{ value }}" style="cursor: auto;">{{ title }}</span>
 {% endif %}