Log Message:
-----------
backporting changes in HEAD to rel-2-4-patches
Tags:
----
rel-2-4-patches
Modified Files:
--------------
pg/macros:
LiveGraphics3D.pl
Revision Data
-------------
Index: LiveGraphics3D.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/Attic/LiveGraphics3D.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lmacros/LiveGraphics3D.pl -Lmacros/LiveGraphics3D.pl -u -r1.1.2.1 -r1.1.2.2
--- macros/LiveGraphics3D.pl
+++ macros/LiveGraphics3D.pl
@@ -65,7 +65,8 @@
sub LiveGraphics3D {
my %options = (
size => [250,250],
- jar => findAppletCodebase("live.jar")."/live.jar",
+ jar => "live.jar", # "${htmlURL}live.jar",
+ codebase => findAppletCodebase("live.jar"),
background => "#FFFFFF",
scale => 1.,
tex_size => 500,
@@ -103,18 +104,18 @@
# start the applet
#
$out .= qq{
- <APPLET ARCHIVE="$options{jar}" CODE="Live.class" WIDTH="$w" HEIGHT="$h">
+ <APPLET CODEBASE="$options{codebase}" ARCHIVE="$options{jar}" CODE="Live.class" WIDTH="$w" HEIGHT="$h">
<PARAM NAME="BGCOLOR" VALUE="$options{background}">
<PARAM NAME="MAGNIFICATION" VALUE="$options{scale}">
};
#
# include the file or data
#
- $out .= qq{<PARAM NAME="INPUT_ARCHIVE" VALUE="$options{archive}">\n}
+ $out .= qq{<PARAM NAME="INPUT_ARCHIVE" VALUE="$options{archive}">\n}
if ($options{archive});
- $out .= qq{<PARAM NAME="INPUT_FILE" VALUE="$options{file}">\n}
+ $out .= qq{<PARAM NAME="INPUT_FILE" VALUE="$options{file}">\n}
if ($options{file});
- $out .= qq{<PARAM NAME="INPUT" VALUE="$options{input}">\n}
+ $out .= qq{<PARAM NAME="INPUT" VALUE="$options{input}">\n}
if ($options{input});
#
# include any independent variables
|
