Merge pull request #2042 from tobiasd/develop

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

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 3f73c6fbbd5fbf2c95de9d62f529b409585854ca..cf6fd25cbc71a25210576892ecf0b2a3ca8c9d23 100644 (file)
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -1,5 +1,5 @@
 /**
- * Friendika people autocomplete
+ * Friendica people autocomplete
  *
  * require jQuery, jquery.textareas
  */
@@ -14,15 +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;
+               var container = elm.getContainer();
+               if(typeof container != "undefined") {
+                       style = $(container).offset();
+                       w = $(container).width();
+               h = $(container).height();
+               }
        }
 
        style.top=style.top+h;
@@ -60,6 +72,7 @@ ACPopup.prototype._search = function(){
                count:100,
                search:this.searchText,
                type:'c',
+               conversation: this.conversation_id,
        }
        
        $.ajax({
@@ -72,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 + '+' + 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();
@@ -82,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){
@@ -96,7 +111,8 @@ ACPopup.prototype._search = function(){
                }
                else {
                        txt = tinyMCE.activeEditor.getContent();
-                       newtxt = txt.replace(that.searchText,t+' ');
+                       //                      alert(that.searchText + ':' + t);
+                       newtxt = txt.replace('@' + that.searchText,'@' + t +' ');
                        tinyMCE.activeEditor.setContent(newtxt);
                        tinyMCE.activeEditor.focus();
                        that.close();
@@ -105,9 +121,13 @@ ACPopup.prototype._search = function(){
        $(this.cont).append(elm);
 }
 ACPopup.prototype.onkey = function(event){
-       if (event.keyCode == '13' && this.idsel>-1) {
-               this.cont.children()[this.idsel].click();
-               event.preventDefault();
+       if (event.keyCode == '13') {
+               if(this.idsel>-1) {
+                       this.cont.children()[this.idsel].click();
+                       event.preventDefault();
+               }
+               else
+                       this.close();
        }
        if (event.keyCode == '38') { //cursor up
                cmax = this.cont.children().size()-1;
@@ -115,14 +135,14 @@ ACPopup.prototype.onkey = function(event){
                if (this.idsel<0) this.idsel=cmax;
                event.preventDefault();
        }
-       if (event.keyCode == '40') { //cursor down
+       if (event.keyCode == '40' || event.keyCode == '9') { //cursor down
                cmax = this.cont.children().size()-1;
                this.idsel++;
                if (this.idsel>cmax) this.idsel=0;
                event.preventDefault();
        }
        
-       if (event.keyCode == '38' || event.keyCode == '40' ) {
+       if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
                this.cont.children().removeClass('selected');
                $(this.cont.children()[this.idsel]).addClass('selected');
        }