Merge remote-tracking branch 'main/master'

2 files changed, 34 insertions, 12 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;
diff --git a/js/main.js b/js/main.js
index babd2a1c3..0b5fb5cdc 100755
--- a/js/main.js
+++ b/js/main.js
@@ -28,13 +28,15 @@
 	var in_progress = false;
 	var langSelect = false;
 	var commentBusy = false;
+	var last_popup_menu = null;
+	var last_popup_button = null;
 
 	$(function() {
 		$.ajaxSetup({cache: false});
 
 		msie = $.browser.msie ;
 		
-		/* setup tooltips */
+		/* setup tooltips *//*
 		$("a,.tt").each(function(){
 			var e = $(this);
 			var pos="bottom";
@@ -43,7 +45,7 @@
 			if (e.hasClass("ttleft")) pos="left";
 			if (e.hasClass("ttright")) pos="right";
 			e.tipTip({defaultPosition: pos, edgeOffset: 8});
-		});
+		});*/
 		
 		
 		
@@ -76,8 +78,21 @@
 			if (menu.attr('popup')=="false") return false;
 			$(this).parent().toggleClass("selected");
 			menu.toggle();
+			if (menu.css("display") == "none") {
+				last_popup_menu = null;
+				last_popup_button = null;
+			} else {
+				last_popup_menu = menu;
+				last_popup_button = $(this).parent();
+			}
 			return false;
 		});
+		$('html').click(function() {
+			last_popup_menu.hide();
+			last_popup_button.removeClass("selected");
+			last_popup_menu = null;
+			last_popup_button = null;
+		});
 		
 		// fancyboxes
 		$("a.popupbox").fancybox({
@@ -573,3 +588,10 @@ Array.prototype.remove = function(item) {
   return this.push.apply(this, rest);
 };
 
+function previewTheme(elm) {
+	theme = $(elm).val();
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
+			$('#theme-preview').html('<a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+	});
+
+}
\ No newline at end of file