--- trunk2/out/js/popup.js	2004/09/26 19:24:15	478
+++ trunk2/out/js/popup.js	2004/09/26 21:59:11	483
@@ -1,12 +1,20 @@
 function popup(link) {
 	var target = 'popup';
-	if (! link)  link = this;
-	if (link.target) target = link.target;
-	//alert("open "+link.href+" in "+target);
-	var popup_win = window.open(link.href,target,'width=400,height=400,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes');
+	var url = this.href;
+
+	if (link.href) {
+		if (link.target) target = link.target;
+		url = link.href;
+	}
+
+	//alert("open "+url+" in "+target+" link:"+link+" this:"+this);
+
+	var popup_win = window.open(url,target,'width=400,height=400,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes');
+
 	if (popup_win) {
 		popup_win.moveTo((screen.width/2),(screen.height/2)-200);
 		popup_win.focus();
 	}
+
 	return false;
 }