X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fautocomplete.js;h=8020478722413cf47937e6f88d6268cccabb62b3;hb=de431e185e81cf7fe3f73b2977f777c040964479;hp=8e64648e98686f2433093846898a27120601a980;hpb=2ac1a2f4ceb94fd3b3e36482c4a6736a09665b83;p=friendica.git

diff --git a/js/autocomplete.js b/js/autocomplete.js
index 8e64648e98..8020478722 100644
--- a/js/autocomplete.js
+++ b/js/autocomplete.js
@@ -104,6 +104,13 @@ function basic_replace(item) {
 	return '$1'+item.name+' ';
 }
 
+function webbie_replace(item) {
+	if(typeof item.replace !== 'undefined')
+		return '$1'+item.replace;
+
+	return '$1'+item.nick+' ';
+}
+
 function trim_replace(item) {
 	if(typeof item.replace !== 'undefined')
 		return '$1'+item.replace;
@@ -163,6 +170,9 @@ function listNewLineAutocomplete(id) {
 		setCaretPosition(text, caretPos + 5);
 		return true;
 	}
+	else {
+		return false;
+	}
 }
 
 function string2bb(element) {
@@ -213,7 +223,7 @@ function string2bb(element) {
 			match: /(^@)([^\n]{2,})$/,
 			index: 2,
 			search: function(term, callback) { contact_search(term, callback, backend_url, 'x', 'contact'); },
-			replace: basic_replace,
+			replace: webbie_replace,
 			template: contact_format,
 		};
 
@@ -222,7 +232,7 @@ function string2bb(element) {
 			match: /(^!)([^\n]{2,})$/,
 			index: 2,
 			search: function(term, callback) { contact_search(term, callback, backend_url, 'x', 'community'); },
-			replace: basic_replace,
+			replace: webbie_replace,
 			template: contact_format,
 		};
 		this.attr('autocomplete', 'off');
@@ -325,11 +335,12 @@ function string2bb(element) {
 		a.on('textComplete:select', function(e, value, strategy) { value; });
 
 		a.keypress(function(e){
-			e.stopImmediatePropagation();
 			if (e.keyCode == 13) {
 				var x = listNewLineAutocomplete(this.id);
-				if(x)
+				if(x) {
+					e.stopImmediatePropagation();
 					e.preventDefault();
+				}
 			}
 		});
 	};