onload aus do.pl und oe.pl entfernt

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 1dc880ef907fdecf8ddd9ad3c4a843f643e02f61..071a7a4c246ad7246a03cbbe4929fcc12eec9f62 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -297,14 +297,15 @@ sub form_header {
   $form->{oldvcname}         =  $form->{"old$form->{vc}"};
   $form->{oldvcname}         =~ s/--.*//;
 
   $form->{oldvcname}         =  $form->{"old$form->{vc}"};
   $form->{oldvcname}         =~ s/--.*//;
 

-  $form->{onload} = "";

   if ($form->{resubmit}) {
   if ($form->{resubmit}) {

+    my $dispatch_to_popup = '';

     if ($form->{format} eq "html") {
     if ($form->{format} eq "html") {

-      $form->{onload} = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
+      $dispatch_to_popup .= "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";

     }
     # emulate click for resubmitting actions
     }
     # emulate click for resubmitting actions

-    $form->{onload} .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
-    $form->{onload} .= "document.do.submit();"
+    $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
+    $dispatch_to_popup .= "document.do.submit();";
+    $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup)");

   }
 
   my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
   }
 
   my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f73c437765486bceb761e5d8f01059ccb1b71a1e..41b9da9b731a20b336148d4f9c0a05881a6d985b 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -402,19 +402,19 @@ sub form_header {
     }
   }
 
     }
   }
 

-  my $onload = "";
+  my $dispatch_to_popup = '';

   if ($form->{resubmit} && ($form->{format} eq "html")) {
   if ($form->{resubmit} && ($form->{format} eq "html")) {

-      $onload  = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
-      $onload .= "document.do.submit();";
+      $dispatch_to_popup  = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
+      $dispatch_to_popup .= "document.do.submit();";

   } elsif ($form->{resubmit}) {
     # emulate click for resubmitting actions
   } elsif ($form->{resubmit}) {
     # emulate click for resubmitting actions

-    $onload  = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
-    $onload .= "document.oe.submit();";
+    $dispatch_to_popup  = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
+    $dispatch_to_popup .= "document.oe.submit();";

   } elsif ($creditwarning) {
   } elsif ($creditwarning) {

-    $onload = "alert('$credittext')";
+    $::request->{layout}->add_javascripts_inline("alert('$credittext')");

   }
 
   }
 

-  $TMPL_VAR{onload} = $onload;
+  $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");

   $TMPL_VAR{dateformat}          = $myconfig{dateformat};
   $TMPL_VAR{numberformat}        = $myconfig{numberformat};
 
   $TMPL_VAR{dateformat}          = $myconfig{dateformat};
   $TMPL_VAR{numberformat}        = $myconfig{numberformat};