Index: openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	5 Nov 2016 17:54:57 -0000	1.1.2.4
+++ openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	17 Nov 2016 16:19:57 -0000	1.1.2.5
@@ -280,16 +280,28 @@
   #
   # Register listeners
   #
-  ad_proc template::add_event_listener -id "oi$object_id" -script [subst {
-    onPreview('$file_url','$type');
+  template::add_event_listener -id "oi$object_id" -script [subst {
+      onPreview('$file_url','$type');
   }]
   if {$folder_p == 0} {
-    ad_proc template::add_event_listener -id "link$object_id" -script [subst {
-      selectImage('$object_id','$file_url','$type');
-    }]
+      template::add_event_listener -id "link$object_id" -script [subst {
+          selectImage('$object_id','$file_url','$type');
+      }]
   }
+  
 }
 
+template::add_event_listener -id "body" -event "blur" -script {
+    window.focus();
+}
+template::add_event_listener -id "ok_button" -script {
+    onOK();
+}
+template::add_event_listener -id "cancel_button" -script {
+    onCancel();
+}
+
+
 set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected]
 switch $selector_type {
   "image" {