Index: openacs-4/www/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/www/default-master.tcl	6 Sep 2002 21:48:44 -0000	1.5
+++ openacs-4/www/default-master.tcl	7 Apr 2003 12:14:39 -0000	1.6
@@ -39,9 +39,22 @@
 if { ![template::util::is_nil focus] } {
     # Handle elements wohse name contains a dot
     regexp {^([^.]*)\.(.*)$} $focus match form_name element_name
+
+    # Add safety code to test that the element exists '
+    set header_stuff "$header_stuff
+      <script language=\"JavaScript\">
+        function acs_focus( form_name, element_name ){
+            if (document.forms == null) return;
+            if (document.forms\[form_name\] == null) return;
+            if (document.forms\[form_name\].elements\[element_name\] == null) return;
+
+            document.forms\[form_name\].elements\[element_name\].focus();
+        }
+      </script>
+    "
     
     template::multirow append \
-            attribute onload "javascript:document.forms\['${form_name}'\].elements\['${element_name}'\].focus()"
+            attribute onload "javascript:acs_focus('${form_name}', '${element_name}')"
 }