[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[albertel]

albertel		Fri May  3 18:32:15 2002 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  - always do our load/unload events first incase there are errors in the webpage
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.55 loncom/xml/londefdef.pm:1.56
--- loncom/xml/londefdef.pm:1.55	Fri Apr 26 14:25:56 2002
+++ loncom/xml/londefdef.pm	Fri May  3 18:32:15 2002
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.55 2002/04/26 18:25:56 sakharuk Exp $
+# $Id: londefdef.pm,v 1.56 2002/05/03 22:32:15 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -337,7 +337,8 @@
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+		                       ';'.$onLoad;
 	      my $onUnload='';
 	      foreach my $key (keys(%{$token->[2]})) {
 		if ($key =~ /^onunload$/i) {
@@ -345,8 +346,8 @@
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=$onUnload.
-		&Apache::lonxml::unloadevents();
+	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
 	      foreach (keys %{$token->[2]}) {