Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -N -r1.66.2.3 -r1.66.2.4
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	27 Sep 2016 07:57:48 -0000	1.66.2.3
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	27 Sep 2016 09:09:19 -0000	1.66.2.4
@@ -248,16 +248,15 @@
 <title>$page_title</title>
 </head>
 "
-
     array set attrs [list]
-
     set attrs(bgcolor) [parameter::get -package_id [ad_acs_kernel_id] -parameter bgcolor -default "white"]
     set attrs(text)    [parameter::get -package_id [ad_acs_kernel_id] -parameter textcolor -default "black"]
 
     if { $focus ne "" } {
-	set attrs(onLoad) "javascript:document.${focus}.focus()"
+        template::add_body_script -script [subst {
+            window.addEventListener('load', function () {document.${focus}.focus()}, false);
+        }]
     }
-
     foreach attr [array names attrs] {
 	lappend attr_list "$attr=\"$attrs($attr)\""
     }
Index: openacs-4/packages/acs-templating/resources/forms/confirm-button.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/confirm-button.adp,v
diff -u -N -r1.4 -r1.4.12.1
--- openacs-4/packages/acs-templating/resources/forms/confirm-button.adp	13 Dec 2007 18:38:06 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/confirm-button.adp	27 Sep 2016 09:09:19 -0000	1.4.12.1
@@ -2,6 +2,6 @@
   <multiple name="__form_contents__">
     <input type="hidden" name="@__form_contents__.__key__@" value="@__form_contents__.__value__@">
   </multiple>
-  <input type="button" value="#acs-kernel.common_Edit#" onclick="javascript:history.back()" onkeypress="javascript:acs_KeypressGoto(document.referrer,event);">
+  <input id="confirm-button" type="button" value="#acs-kernel.common_Edit#">
   <input type="submit" value="#acs-subsite.Confirm#">
 </form>
Index: openacs-4/packages/acs-templating/resources/forms/confirm-button.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/confirm-button.tcl,v
diff -u -N -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-templating/resources/forms/confirm-button.tcl	10 Sep 2015 08:22:04 -0000	1.7.2.1
+++ openacs-4/packages/acs-templating/resources/forms/confirm-button.tcl	27 Sep 2016 09:09:19 -0000	1.7.2.2
@@ -37,6 +37,19 @@
 
 }
 
+template::add_body_script -script [subst {
+    document.getElementById('confirm-button').addEventListener('click', function (event) {
+        event.preventDefault();
+        history.back();
+        return false;
+    });
+    document.getElementById('confirm-button').addEventListener('keypress', function (event) {
+        event.preventDefault();
+        acs_KeypressGoto(document.referrer,event);
+        return false;
+    });
+}]
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4