Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.3.2.16 -r1.3.2.17
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	6 Oct 2016 08:40:28 -0000	1.3.2.16
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	22 Dec 2016 14:14:54 -0000	1.3.2.17
@@ -134,9 +134,8 @@
     }
     if {[my exists listener] && [my set listener] ne ""} {
       lassign [my listener] type body
-      template::add_body_script -script [subst {
-        document.getElementById('[my set id]').addEventListener('$type', function (event) {$body}, false);
-      }]
+      template::add_event_listener -event $type -id [my set id] \
+          -preventdefault=false -script $body
     }
   }