--- loncom/homework/chemresponse.pm 2005/02/17 21:42:37 1.46
+++ loncom/homework/chemresponse.pm 2005/02/18 23:12:29 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.46 2005/02/17 21:42:37 albertel Exp $
+# $Id: chemresponse.pm,v 1.48 2005/02/18 23:12:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -84,7 +84,8 @@ JMESECTION
<html>
<head>
<title>Molecule Editor</title>
-<script language="JavaScript">
+<script type="text/javascript">
+// <!--
function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();
if (jmeFile == "") {
@@ -98,6 +99,7 @@ function submitSmiles() {
function openHelpWindow() {
window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
}
+// -->
</script>
</head>
<body bgcolor="#ffffff">
@@ -109,11 +111,11 @@ $molecule
</applet><br />
<font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
<form>
-<input type="button" name="submit" value="Insert Answer" onClick = "submitSmiles();" />
+<input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />
<br />
-<input type="button" value=" Close " onClick = "window.close()" />
+<input type="button" value=" Close " onclick = "window.close()" />
-<input type="button" value=" Help " onClick = "openHelpWindow()" />
+<input type="button" value=" Help " onclick = "openHelpWindow()" />
</form>
</center>
</body>
@@ -123,7 +125,7 @@ CHEMPAGE
$body=~s/\n/ /g;
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<<CHEMINPUT;
-<input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />
+<input type="button" value="Draw Molecule" onclick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />
CHEMINPUT
return $result;
}
@@ -334,13 +336,15 @@ sub edit_reaction_button {
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<<EDITREACTION;
<script type="text/javascript">
+// <!--
function create_reaction_window_${id}_${field} () {
editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
editor.$docopen;
editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0"> <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
}
+// -->
</script>
-<input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+<input type='button' value='Edit Answer' onclick="javascript:create_reaction_window_${id}_${field}();void(0);" />
EDITREACTION
return $result;
}
@@ -434,8 +438,14 @@ sub end_reactionresponse {
sub start_chem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result = '';
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser);
if ($target eq 'tex' || $target eq 'web') {
- &Apache::lonxml::startredirection();
+ $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ @Apache::scripttag::parser_env = @_;
+ $result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval);
}
return $result;
}
@@ -443,14 +453,6 @@ sub start_chem {
sub end_chem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result = '';
- if ($target eq 'tex' || $target eq 'web') {
- @Apache::scripttag::parser_env = @_;
- if (!$Apache::lonxml::default_homework_loaded) {
- &Apache::lonxml::default_homework_load($safeeval);
- }
- my $innards=&Apache::lonxml::endredirection();
- $result=&Apache::run::run("return &chemparse(q\0$innards\0);",$safeeval);
- }
return $result;
}