X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=js%2Ffk.autocomplete.js;h=cf6fd25cbc71a25210576892ecf0b2a3ca8c9d23;hb=e54414692e6b302cbd3bee88587d3f12c812bf1a;hp=69fe77e8cb2f7762eb81f46f58f56bac709a1a1a;hpb=68541b5dd2f5f83a02133406538b33a17c422e87;p=friendica.git
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
old mode 100755
new mode 100644
index 69fe77e8cb..cf6fd25cbc
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -14,22 +14,27 @@ function ACPopup(elm,backend_url){
this.kp_timer = false;
this.url = backend_url;
+ this.conversation_id = null;
+ var conv_id = this.element.id.match(/\d+$/);
+ if (conv_id) this.conversation_id = conv_id[0];
+ console.log("ACPopup elm id",this.element.id,"conversation",this.conversation_id);
+
+ var w = 530;
+ var h = 130;
+
+
if(typeof elm.editorId == "undefined") {
style = $(elm).offset();
w = $(elm).width();
h = $(elm).height();
}
else {
- style = $(elm.container).offset();
- w = elm.container.offsetWidth;
- h = elm.container.offsetHeight;
- // Quick fix for chrome until I get a tool to inspect the dom
- // Chrome returns 0x0
- if(! w)
- w = 530;
- if(! h)
- h = 130;
-
+ var container = elm.getContainer();
+ if(typeof container != "undefined") {
+ style = $(container).offset();
+ w = $(container).width();
+ h = $(container).height();
+ }
}
style.top=style.top+h;
@@ -67,6 +72,7 @@ ACPopup.prototype._search = function(){
count:100,
search:this.searchText,
type:'c',
+ conversation: this.conversation_id,
}
$.ajax({
@@ -79,8 +85,10 @@ ACPopup.prototype._search = function(){
if (data.tot>0){
that.cont.show();
$(data.items).each(function(){
- html = "{1} ({2})".format(this.photo, this.name, this.nick)
- that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
+ var html = "
{1} ({2})".format(this.photo, this.name, this.nick);
+ var nick = this.nick.replace(' ','');
+ if (this.id!=='') nick += '+' + this.id;
+ that.add(html, nick + ' - ' + this.link);
});
} else {
that.cont.hide();
@@ -89,7 +97,7 @@ ACPopup.prototype._search = function(){
});
}
- ACPopup.prototype.add = function(label, value){
+ACPopup.prototype.add = function(label, value){
var that=this;
var elm = $("