[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonspreadsheet.pm

[www]

www		Tue May 27 15:57:51 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonspreadsheet.pm 
  Log:
  Bug #1499: always call "LONCAPAreg" inline while loading, so that no extra
  window gets opened if loading is aborted.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.72 loncom/interface/lonmenu.pm:1.73
--- loncom/interface/lonmenu.pm:1.72	Tue May 27 11:50:29 2003
+++ loncom/interface/lonmenu.pm	Tue May 27 15:57:51 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.72 2003/05/27 15:50:29 www Exp $
+# $Id: lonmenu.pm,v 1.73 2003/05/27 19:57:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,12 +188,14 @@
          (!&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);';
+            $inlineloadfunction=&regflush();
  	    $unloadfunction='swmenu='.$reopen.'swmenu.windowunloaded(self.name);';
         } 
 	return $result.(<<ENDFUNCTIONS);
@@ -206,6 +208,7 @@
    $unloadfunction
 }
 </script>
+$inlineloadfunction
 $force_title
 ENDFUNCTIONS
     }
Index: loncom/interface/lonspreadsheet.pm
diff -u loncom/interface/lonspreadsheet.pm:1.179 loncom/interface/lonspreadsheet.pm:1.180
--- loncom/interface/lonspreadsheet.pm:1.179	Tue May 27 11:50:30 2003
+++ loncom/interface/lonspreadsheet.pm	Tue May 27 15:57:51 2003
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.179 2003/05/27 15:50:30 www Exp $
+# $Id: lonspreadsheet.pm,v 1.180 2003/05/27 19:57:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,6 @@
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon;
-use Apache::lonmenu;
 use HTML::Entities();
 
 # --------------------------------------------------------- Various form fields
@@ -245,8 +244,7 @@
               &hiddenfield('udom',$ENV{'form.udom'}).
               &hiddenfield('usymb',$ENV{'form.usymb'}).
               &hiddenfield('unewfield','').
-              &hiddenfield('unewformula','').
-              &Apache::lonmenu::regflush());
+              &hiddenfield('unewformula',''));
     $r->rflush();
     #
     # Full recalc?