Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/www/site-master.tcl	6 Oct 2007 11:57:14 -0000	1.27
+++ openacs-4/www/site-master.tcl	12 Dec 2007 00:06:48 -0000	1.28
@@ -88,19 +88,20 @@
               \[$xinha_plugins\];
 
             // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  
-            if(!HTMLArea.loadPlugins(xinha_plugins, xinha_init)) return;
+            if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return;
 
             xinha_editors = xinha_editors ? xinha_editors :\[ $htmlarea_ids \];
-            xinha_config = xinha_config ? xinha_config() : new HTMLArea.Config();
+            xinha_config = xinha_config ? xinha_config() : new Xinha.Config();
             $xinha_params
             $xinha_options
             xinha_editors = 
-                 HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins);
-            HTMLArea.startEditors(xinha_editors);
+                 Xinha.makeEditors(xinha_editors, xinha_config, xinha_plugins);
+            Xinha.startEditors(xinha_editors);
          }
-         window.onload = xinha_init;
+         //window.onload = xinha_init;
       "
 
+  template::add_body_handler -event onload -script "xinha_init();"
   template::head::add_javascript -src ${::xinha_dir}XinhaCore.js
 }