--- loncom/interface/lonmenu.pm	2003/06/05 00:01:45	1.75
+++ loncom/interface/lonmenu.pm	2003/06/06 02:24:49	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.75 2003/06/05 00:01:45 www Exp $
+# $Id: lonmenu.pm,v 1.76 2003/06/06 02:24:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,13 +158,6 @@ ENDINLINEMENU
     }
 }
 
-# ===== Early call to LONCAPAreg for long-running pages, preferably used right 
-# ===== before $r->rflush()
-
-sub regflush {
-    return '<script type="text/javascript">'.&loadevents.'</script>';
-}
-
 # ====================================== This gets called in the header section
 
 sub registerurl {
@@ -187,30 +180,8 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-        my $loadfunction='';
-        my $inlineloadfunction='';
-        my $unloadfunction='';
-        unless (($ENV{'browser.interface'} eq 'textual') ||
-                ($ENV{'environment.remote'} eq 'off') ||
-                ($ENV{'request.publicaccess'})) {
-	    my $reopen=&Apache::lonmenu::reopenmenu();
- 	    $loadfunction='swmenu='.$reopen.'swmenu.windowloaded(self.name);window.focus();';
-            $inlineloadfunction=&regflush();
- 	    $unloadfunction='swmenu='.$reopen.'swmenu.windowunloaded(self.name);';
-        } 
-	return $result.(<<ENDFUNCTIONS);
-<script type="text/javascript">
-function LONCAPAreg() {
-   $loadfunction
-} 
-
-function LONCAPAstale() {
-   $unloadfunction
-}
-</script>
-$inlineloadfunction
-$force_title
-ENDFUNCTIONS
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
@@ -398,12 +369,9 @@ ENDREGTEXT
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
-swmenu=$reopen;
-swmenu.windowloaded(self.name);
 
     function LONCAPAreg() {
 	  swmenu=$reopen;
-          swmenu.windowloaded(self.name);
           swmenu.clearTimeout(swmenu.menucltim);
           $timesync
           $newmail
@@ -431,7 +399,6 @@ swmenu.windowloaded(self.name);
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
-          swmenu.windowunloaded(self.name);
       }
 
 // END LON-CAPA Internal
@@ -455,7 +422,6 @@ var swmenu=null;
 
     function LONCAPAreg() {
 	  swmenu=$reopen
-	  swmenu.windowloaded(self.name);
           $timesync
           swmenu.currentStale=1;
           swmenu.clearbut(2,1);
@@ -472,8 +438,6 @@ var swmenu=null;
     }
 
     function LONCAPAstale() {
- 	  swmenu=$reopen
-	  swmenu.windowunloaded(self.name);  
     }
 
 // END LON-CAPA Internal