Merge pull request #1544 from annando/1505-oembed-bbcode

[friendica.git] / js / fk.autocomplete.js

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index b1db92c41447df473747736f08b68c8d856cad31..cf6fd25cbc71a25210576892ecf0b2a3ca8c9d23 100644 (file)
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -14,6 +14,11 @@ 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;
 
@@ -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 = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
-                                               that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
+                                       var html = "<img src='{0}' height='16px' width='16px'>{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 = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
        elm.click(function(e){
@@ -104,7 +112,7 @@ ACPopup.prototype._search = function(){
                else {
                        txt = tinyMCE.activeEditor.getContent();
                        //                      alert(that.searchText + ':' + t);
-                       newtxt = txt.replace(that.searchText,t+' ');
+                       newtxt = txt.replace('@' + that.searchText,'@' + t +' ');
                        tinyMCE.activeEditor.setContent(newtxt);
                        tinyMCE.activeEditor.focus();
                        that.close();