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

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

1 files changed, 10 insertions, 10 deletions

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 69fe77e8c..b1db92c41 100755
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -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;