From 2af2b9520702c827c0767dd7dd19bfe95ea6400e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 31 Mar 2008 21:11:04 +0000
Subject: fix safari weirdness with caching iframes and auto-submitting them
 (in tax editor at least)

---
 httemplate/elements/popup_link.html | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'httemplate/elements/popup_link.html')

diff --git a/httemplate/elements/popup_link.html b/httemplate/elements/popup_link.html
index 556e19ebe..0915bfa68 100644
--- a/httemplate/elements/popup_link.html
+++ b/httemplate/elements/popup_link.html
@@ -21,16 +21,11 @@ Example:
   } )
 
 </%doc>
-% if ($action && $label) {
+% if ($params->{'action'} && $label) {
 <A HREF="javascript:void(0);" onClick="<% $onclick %>"><% $label %></A>\
 % }
 <%init>
 
-my($action, $label, $actionlabel) = ( '', '', '' );
-my $closetext = 'Close';
-my $width = 540;
-my $color = '#333399';
-
 my $params;
 if (ref($_[0]) eq 'HASH') {
   #$params = { %$params, %{ $_[0] } };
@@ -40,17 +35,7 @@ if (ref($_[0]) eq 'HASH') {
   $params = { @_ };
 }
 
-$action      = $params->{'action'}      if exists $params->{'action'};
-$label       = $params->{'label'}       if exists $params->{'label'};
-$actionlabel = $params->{'actionlabel'} if exists $params->{'actionlabel'};
-$width       = $params->{'width'}       if exists $params->{'width'};
-$color       = $params->{'color'}       if exists $params->{'color'};
-$closetext   = $params->{'closetext'}   if exists $params->{'closetext'};
-
-#stupid safari is caching the "location" of popup iframs, and submitting them
-#instead of displaying them.  this should prevent that.
-my $popup_name = 'popup-'.time. "-$$-". rand() * 2**32;
-
-my $onclick = "overlib( OLiframeContent('$action', $width, 336, '$popup_name' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color', CLOSETEXT, '$closetext' ); return false;";
+my $label = $params->{'label'};
+my $onclick = include('/elements/popup_link_onclick.html', $params);
 
 </%init>
-- 
cgit v1.2.1