Merge branch 'master' of https://github.com/friendica/friendica

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

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 85b51baeb3078796392eb7d09c08faeca4e18a3d..b1db92c41447df473747736f08b68c8d856cad31 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,22 +14,22 @@ function ACPopup(elm,backend_url){
        this.kp_timer = false;
        this.url = backend_url;
 
+       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;
@@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
                }
                else {
                        txt = tinyMCE.activeEditor.getContent();
+                       //                      alert(that.searchText + ':' + t);
                        newtxt = txt.replace(that.searchText,t+' ');
                        tinyMCE.activeEditor.setContent(newtxt);
                        tinyMCE.activeEditor.focus();