From ecfbf9c23d58b672b19f80afb688fbdf05cbb4a5 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sat, 24 Oct 2009 06:47:43 -0600
Subject: [PATCH] doc fixes; no need to load prototype.js here

---
 framework/Editor/lib/Horde/Editor/Fckeditor.php |  6 +++---
 framework/Editor/lib/Horde/Editor/Xinha.php     | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/framework/Editor/lib/Horde/Editor/Fckeditor.php b/framework/Editor/lib/Horde/Editor/Fckeditor.php
index b8238b201..93e1df881 100644
--- a/framework/Editor/lib/Horde/Editor/Fckeditor.php
+++ b/framework/Editor/lib/Horde/Editor/Fckeditor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Editor_fckeditor:: class provides an WYSIWYG editor for use
+ * The Horde_Editor_Fckeditor:: class provides a WYSIWYG editor for use
  * in the Horde Framework.
  *
  * Copyright 2003-2009 The Horde Project (http://www.horde.org/)
@@ -21,8 +21,8 @@ class Horde_Editor_Fckeditor extends Horde_Editor
      * @param array $params  The following configuration parameters:
      * <pre>
      * 'id' - The ID of the text area to turn into an editor.
-     * 'no_notify' - Don't output JS code via notification library. Code will
-     *               be stored for access via getJS().
+     * 'no_notify' - Don't output JS code automatically. Code will be stored
+     *               for access via getJS().
      * </pre>
      */
     public function __construct($params = array())
diff --git a/framework/Editor/lib/Horde/Editor/Xinha.php b/framework/Editor/lib/Horde/Editor/Xinha.php
index d9fc13e11..3ae8c5684 100644
--- a/framework/Editor/lib/Horde/Editor/Xinha.php
+++ b/framework/Editor/lib/Horde/Editor/Xinha.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Editor_xinha:: class provides access to the Xinha editor for use
+ * The Horde_Editor_Xinha:: class provides access to the Xinha editor for use
  * in the Horde Framework.
  *
  * Xinha website: http://xinha.python-hosting.com/
@@ -16,7 +16,7 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package Horde_Editor
  */
-class Horde_Editor_xinha extends Horde_Editor
+class Horde_Editor_Xinha extends Horde_Editor
 {
     /**
      * Constructor.
@@ -31,7 +31,7 @@ class Horde_Editor_xinha extends Horde_Editor
      * 'lang' - The language to use. (Default: en)
      * 'loadnotify' - Display notification graphic when loading (Default: no)
      * 'no_autoload' - Don't load xinha by default on pageload.
-     * 'no_notify' - Don't output JS code via notification library. Code will
+     * 'no_notify' - Don't output JS code automatically. Code will
      *               be stored for access via getJS().
      * 'noplugins' - A list of plugins to specifically never load.
      * 'plugins' - Any plugins to load in addition to the plugins_stored in
@@ -138,10 +138,6 @@ class Horde_Editor_xinha extends Horde_Editor
         $js .= '_editors = Xinha.makeEditors(xinha_editors, xinha_config, xinha_plugins);' .
                'Xinha.startEditors(_editors); };';
 
-        if (empty($params['no_autoload'])) {
-            Horde::addScriptFile('prototype.js', 'horde');
-        }
-
         if (!empty($params['no_notify'])) {
             $js .= 'Event.observe(window, \'load\', xinha_init);';
             $this->_js = '<script type="text/javascript">' . $js . '</script><script type="text/javascript" src="' . $xinha_path . 'XinhaCore.js"></script>';
-- 
2.11.0