--- loncom/interface/Attic/lonspreadsheet.pm 2003/03/07 04:20:20 1.174
+++ loncom/interface/Attic/lonspreadsheet.pm 2003/03/11 15:00:47 1.177
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.174 2003/03/07 04:20:20 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.177 2003/03/11 15:00:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -183,10 +183,7 @@ sub handler {
# Header....
#
$r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
- my $nothing = "''";
- if ($ENV{'browser.type'} eq 'explorer') {
- $nothing = "'javascript:void(0);'";
- }
+ my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
if ($ENV{'request.role'} !~ /^st\./) {
$r->print(<<ENDSCRIPT);
@@ -1526,7 +1523,7 @@ sub expandnamed {
foreach my $varname ( @vars ) {
if ($varname=~/\D/) {
$formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
- $varname=~s/$var/\([\\w:-]\+\)/g;
+ $varname=~s/$var/\([\\w:\\- ]\+\)/g;
foreach (keys(%{$self->{'constants'}})) {
if ($_=~/$varname/) {
$values{$1}=1;