--- loncom/homework/edit.pm	2003/08/04 22:07:29	1.59
+++ loncom/homework/edit.pm	2003/08/14 19:30:34	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.59 2003/08/04 22:07:29 albertel Exp $
+# $Id: edit.pm,v 1.60 2003/08/14 19:30:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -575,16 +575,36 @@ sub select_or_text_arg {
 	    $optionlist.="<option $value>$option</option>\n";
 	}
     }
-    $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
-    if (($found) || (!$selected)) {
-	$result.=$description.'&nbsp;<select name="'.&html_element_name($name)
-            .'">
-       '.$optionlist.'
-      </select>';
-    } else {
-	$result.=&text_arg($description,$name,$token,$size);
-    }
-    return '<nobr>'.$result.'</nobr>';
+    $optionlist.="<option value=\"TYPEDINVALUE\"".
+ 	((!$found)?' selected="on"':'').
+ 	">Type in value</option>\n";
+#
+    my $element=&html_element_name($name);
+    my $selectelement='select_list_'.$element;
+    my $typeinelement='type_in_'.$element;
+    my $typeinvalue=($found?'':$selected);
+#
+    my $hiddenvalue='this.form.'.$element.'.value';
+    my $selectedindex='this.form.'.$selectelement.'.selectedIndex';
+    my $selectedvalue='this.form.'.$selectelement.
+	     '.options['.$selectedindex.'].value';
+    my $typedinvalue='this.form.'.$typeinelement.'.value';
+    my $selecttypeinindex='this.form.'.$selectelement.'.options.length';
+#
+    return (<<ENDSELECTORTYPE);
+<nobr>
+$description
+&nbsp;<select name="$selectelement"
+onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }"
+$optionlist
+</select>
+<input type="text" size="$size" name="$typeinelement"
+       value="$typeinvalue" 
+onChange="$hiddenvalue=$typedinvalue;"
+onFocus="$selectedindex=$selecttypeinindex-1;" />
+<input type="hidden" name="$element" value="$selected" />
+</nobr>
+ENDSELECTORTYPE
 }
 
 #----------------------------------------------------- image coordinates