Changeset 172

Timestamp:

05/18/05 21:15:06 (8 years ago)

Author:

yermol

Message:

htmlarea.js

. added workaround fix for NASTY FIREFOX BUG resulting in the infamous

uneditable area problem (exception on designMode="on" issue -
refer to bug:

https://bugzilla.mozilla.org/show_bug.cgi?id=207842

and this thread:

http://xinha.gogo.co.nz/punbb/viewtopic.php?id=229

. trailing <BR>'s are no longer stripped out of the document. This

was wreaking havoc on EnterParagraphs. It's not clear whether or not
this is going to have unanticipated side-effects.

plugins/EnterParagraphs/enter-paragraphs.js

NOT FULLY FUNCTIONAL YET - DOESN'T HANDLE ALL CASES CORRECTLY,
but it's much better than it was I think.

. largely reworked.
. changed obfuscated variables names to make it more readable.
. expanded out nested (x ? y : z) constructs to make it more readable.
. added alot of comments.
. fixed a serious bug in findEachNodeUnder() that was not correctly

handling beginning and end node conditions.

. fixed design flaw that selected a non-existent insertion point for

placing the cursor.

. fixed several exceptions.
. now correctly handles lists by passing the back back to the Gecko

engine if we are in a list with the exception of being at the
first position in the first element in which case we insert
a paragraph before the list and move the cursor back to the first
item on the list.

Location:

branches/unified_backend

Files:

• RELEASE_NOTES.txt (modified) (1 diff)
• ddt/ddt.js (modified) (4 diffs)
• ddt/ddt.php (modified) (1 diff)
• examples/full_example-body.php (modified) (3 diffs)
• examples/full_example-menu.html (modified) (3 diffs)
• examples/simple_example.php (modified) (3 diffs)
• htmlarea.js (modified) (72 diffs)
• index.html (modified) (2 diffs)
• plugins/EnterParagraphs/enter-paragraphs.js (modified) (3 diffs)
• plugins/ImageManager/backend.php (modified) (1 diff)
• plugins/ImageManager/config.inc.php (modified) (2 diffs)
• plugins/ImageManager/image-manager.js (modified) (7 diffs)
• plugins/ImageManager/images.php (modified) (7 diffs)
• plugins/ImageManager/manager.php (modified) (2 diffs)
• plugins/Linker/linker.js (modified) (3 diffs)
• plugins/Linker/scan.php (modified) (1 diff)
• popups/about.html (modified) (1 diff)

branches/unified_backend/RELEASE_NOTES.txt

@@ -3 +3 @@
 by: Yermo Lamers of DTLink, LLC
 http://www.formvista.com/contact.html
+
+---------------------------------------------------------------------
+2005-05-17: dev snapshot change summary
+
+examples/simple_sample.php
+
+. removed styllist. There is some exception problem I haven't tracked
+  down yet.
+
+ddt/ddt.js
+
+. Should now work under MSIE.
+
+htmlarea.js
+
+. added workaround fix for NASTY FIREFOX BUG resulting in the infamous
+  uneditable area problem (exception on designMode="on" issue - 
+  refer to bug: 
+
+  https://bugzilla.mozilla.org/show_bug.cgi?id=207842
+
+  and this thread:
+
+  http://xinha.gogo.co.nz/punbb/viewtopic.php?id=229
+
+. trailing <BR>'s are no longer stripped out of the document. This
+  was wreaking havoc on EnterParagraphs. It's not clear whether or not
+  this is going to have unanticipated side-effects.
+
+plugins/EnterParagraphs/enter-paragraphs.js
+
+  NOT FULLY FUNCTIONAL YET - DOESN'T HANDLE ALL CASES CORRECTLY,
+  but it's much better than it was I think.
+
+. largely reworked.
+. changed obfuscated variables names to make it more readable.
+. expanded out nested (x ? y : z) constructs to make it more readable.
+. added alot of comments.
+. fixed a serious bug in findEachNodeUnder() that was not correctly
+  handling beginning and end node conditions.
+. fixed design flaw that selected a non-existent insertion point for 
+  placing the cursor.
+. fixed several exceptions.
+. now correctly handles lists by passing the back back to the Gecko
+  engine if we are in a list with the exception of being at the
+  first position in the first element in which case we insert
+  a paragraph before the list and move the cursor back to the first
+  item on the list.
+
+---------------------------------------------------------------------
+2005-05-09: dev snapshot change summary
+
+plugins/linker/scan.php
+
+. fixed misformed debug message.
 
 ---------------------------------------------------------------------

branches/unified_backend/ddt/ddt.js

@@ -52 +52 @@
 //      Error: uncaught exception: Permission denied to get property Window.DDT_STATUS
 // .    setting the title of the debug window so you can tell which domain it refers to.
+//
+// 2005-05-12 YmL:
+//      .       added _ddtDumpNode() to dump node details along with message.
+//
 // -----------------------------
+
+
+
+/**
+* browser identification
+*/
+
+DDT.agt = navigator.userAgent.toLowerCase();
+DDT.is_ie          = ((DDT.agt.indexOf("msie") != -1) && (DDT.agt.indexOf("opera") == -1));
+DDT.is_opera  = (DDT.agt.indexOf("opera") != -1);
+DDT.is_mac         = (DDT.agt.indexOf("mac") != -1);
+DDT.is_mac_ie = (DDT.is_ie && DDT.is_mac);
+DDT.is_win_ie = (DDT.is_ie && !DDT.is_mac);
+DDT.is_gecko  = (navigator.product == "Gecko");
 
 /**
@@ -121 +139 @@
         //
         // We'll just use the hostname here to make the window name unique.
-
-        this.popup = window.open( "", "ddt_popup_" + location.host,
+        //
+        // Something to note, MSIE 6 (at least under win98) throws an exception
+        // if there are any "."'s in the window name, so we replace them with underscores here.
+
+        var window_name = "ddt_popup_" + location.hostname.replace( /[.]/g, "_" );
+
+        if (DDT.is_gecko) 
+                {
+                this.popup = window.open( "", "ddt_popup_" + location.host,
                               "toolbar=no,menubar=no,personalbar=no,width=800,height=450," +
                               "scrollbars=no,resizable=yes,modal=yes,dependable=yes");
+                }
+        else
+                {
+
+                this.popup = window.open("", window_name,
+              "toolbar=no,location=no,directories=no,status=no,menubar=no," +
+              "scrollbars=no,resizable=yes,width=800,height=450");
+
+                }
+
+        // did we manage to open a window?
+
+        if (( typeof this.popup == 'undefined' ) || ( this.popup == null ))
+                {
+                alert( "FAILED TO OPEN DEBUGGING TRACE WINDOW" );
+
+                return false;
+                }
 
         // it's possible that the window was left open or we are another object
         // sharing the same window.
 
-        if ( typeof this.popup.DDT_STATUS == 'undefined' )
+        if (( this.popup != null ) && ( typeof this.popup.DDT_STATUS == 'undefined' ))
                 {
 
@@ -207 +250 @@
         }
 
-}
+}       // end of _ddt()
+
+// --------------------------------
+
+/**
+* dumps key properties from a node.
+*/
+
+DDT.prototype._ddtDumpNode = function( file, line, msg, node )
+{
+
+if ( typeof node == 'undefined' )
+        {
+        this._ddt(
+                file, line, msg + " -- Node is undefined!" );
+
+        return;
+        }
+
+if ( node == null )
+        {
+        this._ddt(
+                file, line, msg + " -- Node is null!" );
+        }
+
+this._ddt( 
+        file, line, msg + "<br>" + this.FragmentToString( node, 0 ) );
+
+} // end of _ddtDumpNode()
 
 // --------------------------------
@@ -255 +326 @@
 
 /**
-* dumps an object tree
-*
-* displays a tree of html elements. Design based on method from htmlarea.js
+* generates a string description of a document fragment.
+*
+* returns a tree of html elements. Design based on method from htmlarea.js
 *
 * @see ddtpreproc.php
-* @param root top of tree to display
+* @param root top of tree to generate
 * @param level depth level.
 */
 
-DDT.prototype._ddtDumpTree = function(root, level) 
+DDT.prototype.FragmentToString = function(root, level) 
 {                                                         
-var tag = root.tagName.toLowerCase(), i;
-var ns = HTMLArea.is_ie ? root.scopeName : root.prefix;
-
-// FIXME: separated on multiple lines to avoid being picked
-// up by ddtpreproc.php
-
-this._ddt( 
-        ":","0", level + "- " + tag + " [" + ns + "]" 
-        );
-
-for (i = root.firstChild; i; i = i.nextSibling)
-        if (i.nodeType == 1)
-                this._ddtDumpTree(i, level + 2);
+
+var retval = "";
+
+if ( typeof root == 'undefined' )
+        return " root undefined ";
+
+if ( root == null )
+        return " root is null ";
+
+// it may be a mozilla range object:
+
+if ( typeof root.cloneRange != 'undefined' )
+        {
+        // we have a range object. 
+
+        retval = "RANGE OBJECT - start offset '" + root.startOffset + "' end offset '" + root.endOffset + "'<br>";
+        retval += "RANGE START:<br>" + this.FragmentToString( root.startContainer, level );
+        retval += "RANGE END:<br>" + this.FragmentToString( root.endContainer, level );
+
+        return retval;
+        }
+
+if ( typeof root.childNodes == 'undefined' )
+        return " root is not a node";
+
+var childretval = "";
+
+// interestingly if you do not declare a local var for the iterator
+// it seems to become a static variable which mucks up the recursion
+
+var i = 0;
+
+for (i = 0; i < root.childNodes.length; i++)
+        {
+        childretval += this.FragmentToString( root.childNodes[i], level + 2);
+        }
+
+retval = this.indent( level ) + this._ddtGetNodeType( root ) + " - " + root.childNodes.length + " children <br>" + childretval;
+
+return retval;
+
 };
 
+// -------------------------------------------------
+
+/**
+* indent by level
+*/
+
+DDT.prototype.indent = function( level )
+{
+
+var retval = "";
+
+for (i = 0; i<level; i++ )
+        {
+        retval += "&nbsp;&nbsp;";
+        }
+
+return retval;
+
+}
+// -----------------------------------------
+
+/**
+* displays node type
+*/
+
+DDT.prototype._ddtGetNodeType = function( node )
+{
+
+var retval = "";
+
+if ( typeof node == 'undefined' )
+        {
+        return "TYPE_IS_UNDEFINED";
+        }
+
+if ( node == null )
+        {
+        return "TYPE_IS_NULL!";
+        }
+
+if ( typeof node.nodeType == 'undefined' )
+        {
+        return "NOT_A_NODE_OBJECT - type is '" + typeof node + "'";
+        }
+
+switch ( node.nodeType )
+        {
+
+        case 1:
+                retval = "ELEMENT_NODE - tag '" + node.nodeName + "'";
+                return retval;
+                break;
+
+        case 2:
+                return "ATTRIBUTE_NODE";
+                break;
+
+        case 3:
+                retval = "TEXT_NODE";
+                retval = retval + " contents '" + node.nodeValue + "'";
+                return retval;
+
+                break;
+
+        case 4:
+                return "CDATA_SECTION_NODE";
+                break;
+
+        case 5:
+                return "ENTITY_REFERENCE_NODE";
+                break;
+
+        case 6:
+                return "ENTITY_NODE";
+                break;
+
+        case 7:
+                return "PROCESSING_INSTRUCTION_NODE";
+                break;
+
+        case 8:
+                return "COMMENT_NODE";
+                break;
+
+        case 9:
+                return "DOCUMENT_NODE";
+                break;
+
+        case 10:
+                return "DOCUMENT_TYPE_NODE";
+                break;
+
+        case 11:
+                retval = "DOCUMENT_FRAGMENT_NODE";
+
+                return retval;
+                break;
+
+        case 12:
+                return "NOTATION_NODE";
+                break;
+
+        default:
+                return "UNKNOWN_NODE!";
+                break;
+
+        } // end of switch
+
+};      // end of _ddtDumpNode()
+
+// ----------------------------------------------------------
+
+/**
+* getHTMLSource() - returns HTML source for display in a browser window.
+*/
+
+DDT.prototype.getHTMLSource = function( html )
+{
+
+html = html.replace( /</ig, "&lt;" );
+html = html.replace( />/ig, "&gt;" );
+html = html.replace( /&/ig, "&amp;" );
+html = html.replace(/\xA0/g, "&nbsp;");
+html = html.replace(/\x22/g, "&quot;");
+
+return html;
+
+}       // end of showHTML()
+
 // END
 

branches/unified_backend/ddt/ddt.php

@@ -89 +89 @@
                 }
 
-        fputs( $fvDEBUG[ "logfile_fp" ], "$msgline" );
+        fwrite( $fvDEBUG[ "logfile_fp" ], $msgline );
         fflush( $fvDEBUG[ "logfile_fp" ] );
 

branches/unified_backend/examples/full_example-body.php

@@ -180 +180 @@
     }
 
-    window.onload = xinha_init;
+    // calling xinha_init twice can cause a nasty little exception.
+    // window.onload = xinha_init;
+
   </script>
 </head>
@@ -204 +206 @@
     --------------------------------------------------------------------------->
 
-        <div id="lipsum" style="display:none">
+    <div id="lipsum" style="display:none"><h1>TEST</h1></div>
+
+        <div id="lipsumx" style="display:none">
           <p>This is an example of a Xinha editor with extensive trace messages
                          turned on. To turn off trace messages, assuming you have the source, just
@@ -228 +232 @@
                          file from the Xinha_ub branch.</p>
         </div>
+
         <script src="full_example.js"></script>
 

branches/unified_backend/examples/full_example-menu.html

@@ -37 +37 @@
       <legend>Plugins</legend>
       <label>
+        <input type="checkbox" name="plugins" value="EnterParagraphs"  /> EnterParagraphs
+      </label>
+      <label>
         <input type="checkbox" name="plugins" value="CSS"  /> CSS
       </label>
@@ -46 +49 @@
       </label>
       <label>
-        <input type="checkbox" name="plugins" value="FullScreen" checked /> FullScreen
+        <input type="checkbox" name="plugins" value="FullScreen" /> FullScreen
       </label>
       <label>
-        <input type="checkbox" name="plugins" value="CharacterMap" checked /> CharacterMap
+        <input type="checkbox" name="plugins" value="CharacterMap" /> CharacterMap
       </label>
       <label>
@@ -55 +58 @@
       </label>
       <label>
-        <input type="checkbox" name="plugins" value="ListType" checked /> ListType
+        <input type="checkbox" name="plugins" value="ListType" /> ListType
       </label>
 
       <label>
-        <input type="checkbox" name="plugins" value="Stylist" checked /> Stylist
+        <input type="checkbox" name="plugins" value="Stylist" /> Stylist
       </label>
 
       <label>
-        <input type="checkbox" name="plugins" value="TableOperations" checked /> TableOperations
+        <input type="checkbox" name="plugins" value="TableOperations" /> TableOperations
       </label>
 
       <label>
-        <input type="checkbox" name="plugins" value="InsertAnchor" checked /> InsertAnchor
+        <input type="checkbox" name="plugins" value="InsertAnchor" /> InsertAnchor
       </label>
     </fieldset>

branches/unified_backend/examples/simple_example.php

@@ -30 +30 @@
     //  eg: _editor_url = "../";
     // in this example we do a little regular expression to find the absolute path.
-    _editor_url  = document.location.href.replace(/examples\/simple_example\.html.*/, '')
+    _editor_url  = document.location.href.replace(/examples\/simple_example\.php.*/, '')
     _editor_lang = "en";      // And the language we need to use in the editor.
   </script>
@@ -190 +190 @@
 
     <textarea id="TextArea1" name="TextArea1" rows="10" cols="80" style="width:100%">
-         This is the content of TextArea1 from xinha_ub/examples/simple_example.html.<br>
+         This is the content of TextArea1 from xinha_ub/examples/simple_example.php.<br>
          In order to see the new debugging trace messages you will need to turn off
          popup blockers for this site.<br>
@@ -196 +196 @@
          commenting out or uncomments the _ddtOn() line. The same applies to the trace
          messages inside the HTMLArea object in htmlarea.js.
+         The version of EnterParagraphs in this editor should be largely fixed. If you notice
+         any problems please report them in the forums.
          </textarea>
 

branches/unified_backend/htmlarea.js

@@ -273 +273 @@
   *
   * set to 'built-in', 'dirty' or 'best'
-  * built-in: will (may) use 'br' instead of 'p' tags
+  * built-in: will (may) use 'br' instead of 'p' tags (passes it off to the brower builtin handler)
   * dirty   : will use p and work good enough for the majority of cases,
   * best    : works the best, but it's about 12kb worth of javascript
@@ -280 +280 @@
   */
 
-  this.mozParaHandler = 'best'; 
+  this.mozParaHandler = 'built-in'; 
 
   /**
@@ -2139 +2139 @@
 /**
 * getHTMLWrapper()
+*
+* Called, for instance, when switching from wysiwyg to text mode. 
 */
 
@@ -2190 +2192 @@
       var i;
       var root_tag = (root.nodeType == 1) ? root.tagName.toLowerCase() : '';
+
+                        // removes br tags from the end of root level. 
+
+/* yml: Temporarily disabling.
+
       if (root_tag == 'br' && !root.nextSibling)
+                                {
+                          HTMLArea._ddt( "htmlarea.js","2146", "getHTMLWrapper(): skipping (removing) terminating root level BR tag." );
         break;
+                                }
+*/
 
       if (outputRoot)
+                                {
         outputRoot = !(editor.config.htmlRemoveTags && editor.config.htmlRemoveTags.test(root_tag));
+                                }
 
       if (HTMLArea.is_ie && root_tag == "head") 
-                  {
+                          {
         if (outputRoot)
+                                        {
           html += "<head>";
+                                        }
+
         // lowercasize
+
         var save_multiline = RegExp.multiline;
         RegExp.multiline = true;
-        var txt = root.innerHTML.replace(HTMLArea.RE_tagName, function(str, p1, p2) 
-                    {
-          return p1 + p2.toLowerCase();
-          });
+        var txt = root.innerHTML.replace(HTMLArea.RE_tagName, 
+                                                                                function(str, p1, p2) 
+                                                                            {
+                                                          return p1 + p2.toLowerCase();
+                                                          });
 
         RegExp.multiline = save_multiline;
         html += txt;
+
         if (outputRoot)
+                                        {
           html += "</head>";
+                                        }
+
         break;
         } 
@@ -2220 +2242 @@
         var attrs = root.attributes;
         for (i = 0; i < attrs.length; ++i) 
-                    {
+                            {
           var a = attrs.item(i);
           if (!a.specified) 
-                           {
+                                                {
             continue;
             }
@@ -2229 +2251 @@
           var name = a.nodeName.toLowerCase();
           if (/_moz_editor_bogus_node/.test(name)) 
-                           {
+                                                {
             html = "";
             break;
@@ -2243 +2265 @@
 
           if (name != "style") 
-                           {
+                                                {
 
             // IE5.5 reports 25 when cellSpacing is
@@ -2257 +2279 @@
 
             if (typeof root[a.nodeName] != "undefined" && name != "href" && name != "src" && !/^on/.test(name)) 
-                                  {
+                                                        {
               value = root[a.nodeName];
               } 
-                                else 
-                                  {
+                                                else 
+                                                        {
               value = a.nodeValue;
 
@@ -2269 +2291 @@
 
               if (HTMLArea.is_ie && (name == "href" || name == "src")) 
-                                    {
+                                                    {
+
+                                                                HTMLArea._ddt( "htmlarea.js", "2292", "getHTMLWrapper(): because we are ie and have an href or src attribute we are calling stripBaseUrl" );
+
                 value = editor.stripBaseURL(value);
                 }
               }
             } 
-                         else 
-                           { 
+                                 else 
+                                                { 
                                 
-                                // IE fails to put style in attributes list
+                                                // IE fails to put style in attributes list
             // FIXME: cssText reported by IE is UPPERCASE
 
@@ -2284 +2309 @@
 
           if (/^(_moz)?$/.test(value)) 
-                           {
+                                                {
             // Mozilla reports some special tags
             // here; we don't need them.
@@ -2295 +2320 @@
 
         if (html != "") 
-                    {
+                                        {
           html += closed ? " />" : ">";
           }
@@ -2302 +2327 @@
 
       for (i = root.firstChild; i; i = i.nextSibling) 
-                  {
+                                {
         html += HTMLArea.getHTMLWrapper(i, true, editor);
         }
 
       if (outputRoot && !closed) 
-                  {
+                                {
         html += "</" + root.tagName.toLowerCase() + ">";
         }
@@ -3084 +3109 @@
 
       obj.swapImage = function(newimg)
-        {
-        if(typeof newimg != 'string')
-          {
-          img.src = newimg[0];
-          img.style.position = 'relative';
-          img.style.top  = newimg[2] ? ('-' + (18 * (newimg[2] + 1)) + 'px') : '-18px';
-          img.style.left = newimg[1] ? ('-' + (18 * (newimg[1] + 1)) + 'px') : '-18px';
-          }
-        else
-          {
-          obj.imgel.src = newimg;
-          img.style.top = '0px';
-          img.style.left = '0px';
-          }
-        }
+                                                                        {
+                                                                        if(typeof newimg != 'string')
+                                                                          {
+                                                                          img.src = newimg[0];
+                                                                          img.style.position = 'relative';
+                                                                          img.style.top  = newimg[2] ? ('-' + (18 * (newimg[2] + 1)) + 'px') : '-18px';
+                                                                          img.style.left = newimg[1] ? ('-' + (18 * (newimg[1] + 1)) + 'px') : '-18px';
+                                                                          }
+                                                                        else
+                                                                          {
+                                                                          obj.imgel.src = newimg;
+                                                                          img.style.top = '0px';
+                                                                          img.style.left = '0px';
+                                                                          }
+                                                                        }       // end of function definition.
 
       } 
@@ -3209 +3234 @@
 */
 
-HTMLArea.prototype.generate = function ()
+HTMLArea.prototype.generate = function()
   {
 
   this.ddt._ddt( "htmlarea.js","3214", "generate(): top" );
 
-  var editor = this;    // we'll need "this" in some nested functions
+        // we need "this" in some nested functions (i.e. closures) so a local
+        // variable is used to "transmit" it to the enclosed function. Weird
+        // javascript enclosure concept.
+
+  var editor = this;    
 
   // If this is gecko, set up the paragraph handling now
@@ -3227 +3256 @@
           {
 
-                         this.ddt._ddt( "htmlarea.js","3229", "generate(): mozParaHandler config set to 'best'. Loading EnterParagraphs" );
+                                        this.ddt._ddt( "htmlarea.js","3229", "generate(): mozParaHandler config set to 'best'. Loading EnterParagraphs" );
 
           EnterParagraphs = 'null';
-          HTMLArea._loadback
-            (_editor_url + 'plugins/EnterParagraphs/enter-paragraphs.js', function() { editor.registerPlugin('EnterParagraphs'); editor.generate(); } );
+          HTMLArea._loadback(_editor_url + 'plugins/EnterParagraphs/enter-paragraphs.js', 
+                                                                                        function() 
+                                                                                                { 
+                                                                                                editor.generate(); 
+                                                                                                return true;
+                                                                                                } );
+
           return false;
+
           }
+
+                                editor.registerPlugin(eval('EnterParagraphs'));
+
         }
 
@@ -3342 +3380 @@
         {
 
-                  this.ddt._ddt( "htmlarea.js","3344", "generate(): f.onsubmit(): top" );
+                                this.ddt._ddt( "htmlarea.js","3344", "generate(): f.onsubmit(): top" );
 
         var a = this.__msh_prevOnSubmit;
@@ -3459 +3497 @@
   this.notifyOn('panel_change',function(){editor.setInnerSize();});
 
-  this.ddt._ddt( "htmlarea.js","3461", "generate(): bottom before timeout call to initIframe()" );
-
-  // IMPORTANT: we have to allow Mozilla a short time to recognize the
-  // new frame.  Otherwise we get a stupid exception.
-
-  setTimeout(function() { editor.initIframe()}, 50);
+  this.ddt._ddt( "htmlarea.js","3461", "generate(): bottom before event call to initIframe()" );
+
+        // instead of using a timeout which by definition produces an occassional race condition
+        // depending on performance, we tie calling initFrame to the frame being completely
+        // loaded.
+        //
+        // See:
+        //
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=207842
+        //
+        // notably the link to:
+        //
+        // http://derekdev.com/mozilla/iframeworky.html
+        //
+        // So far I can't seem to get this EventListener to "turn off" but this does 
+        // seem to fix the exceptions problem we've been seeing and it's alot
+        // cleaner than "waiting". Under some circumstances I'm noticing quite a long
+        // delay here depending on how long FireFox has been running.
+
+        if ( HTMLArea.is_gecko )
+                {
+
+                // need to get a var into the closure below.
+
+                editor.isGenerated = false;
+
+                this._iframe.addEventListener("load", 
+                                                function(e)
+                                {
+
+                                                        if ( !editor.isGenerated )
+                                                                {
+                                                                editor.isGenerated = true;
+                        editor.initIframe();
+                                                                }
+
+                                                        return true;
+
+                                }, 
+                                                false);
+                }
+        else
+                {
+
+                // MSIE uses a different method to attach events. MSIE does not
+                // suffer from the bug which forces us to wait for the iFrame in 
+                // firefox but it seems like a good idea to do it the same way
+                // instead of calling initframe directly. Both seem to work equally
+                // as well ... 
+
+    this._iframe.attachEvent("onload",                                          
+                                                function(e)
+                                {
+
+                                                        if ( !editor.isGenerated )
+                                                                {
+                                                                editor.isGenerated = true;
+                        editor.initIframe();
+                                                                }
+
+                                                        return true;
+
+                                });
+                }
+
+        return true;
 
   };  // end of HTMLArea.prototype.generate()
@@ -3488 +3586 @@
 
     if (!doc) 
-           {
+                        {
       // Try again..
       // FIXME: don't know what else to do here.  Normally
@@ -3494 +3592 @@
 
       if (HTMLArea.is_gecko) 
-                  {
+                          {
         setTimeout(function() { editor.initIframe()}, 50);
         return false;
         } 
-                else 
-                  {
+                        else 
+                          {
         alert("ERROR: IFRAME can't be initialized.");
         }
@@ -3506 +3604 @@
   catch(e)
     {
+
+    alert("EXCEPTION: couldn't get doc in initFrame - delaying and returning.");
+
     setTimeout(function() { editor.initIframe()}, 50);
+
+                return false;
     }
 
@@ -3516 +3619 @@
     html += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" + editor.config.charSet + "\">\n";
 
-    if(typeof editor.config.baseHref != 'undefined' && editor.config.baseHref != null)
+    if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref != null)
       {
       html += "<base href=\"" + editor.config.baseHref + "\"/>\n";
@@ -3552 +3655 @@
     {
     var html = editor.inwardHtml(editor._textArea.value);
+
     if (html.match(HTMLArea.RE_doctype)) 
-           {
+                        {
       editor.setDoctype(RegExp.$1);
       html = html.replace(HTMLArea.RE_doctype, "");
       }
+
     doc.open();
     doc.write(html);
@@ -3907 +4012 @@
     {
 
-    try{HTMLArea.last_on.designMode = 'off';} catch(e) { }
+                // if this is the first time here last_on has not been set so this will
+                // generate an exception.
+
+    try 
+                        {
+                        HTMLArea.last_on.designMode = 'off';
+                        } 
+                catch(e) 
+                        {
+                  this.ddt._ddt( "htmlarea.js","3904", "activateEditor(): exception trying to set last_on.designMode to off. First time here?" );
+                        }
 
     this.ddt._ddt( "htmlarea.js","3911", "activateEditor(): _iframe.style.display is '" + this._iframe.style.display + "'" );
 
-    if(this._iframe.style.display == 'none')
+    if ( this._iframe.style.display == 'none' )
       {
       this._iframe.style.display = '';
@@ -3919 +4034 @@
     else
       {
-
-                this.ddt._ddt( "htmlarea.js","3922", "activateEditor(): setting designMode to on" );
-
-      this._doc.designMode = 'on';
-      }
-    }
-  else
-    {
-
-         this.ddt._ddt( "htmlarea.js","3930", "activateEditor(): Setting contentEditable to true" );
+                        this.ddt._ddt( "htmlarea.js","3922", "activateEditor(): setting designMode to on" );
+
+                        // under FireFox we're endlessly getting exceptions here.
+
+                        try
+                                {
+        this._doc.designMode = 'on';
+                                }
+                        catch( e )
+                                {
+                                alert( "EXCEPTION - failed to turn design mode on in activateEditor() - " + e + "'" );
+                                }
+      }
+    }
+  else if ( HTMLArea.is_ie )
+    {
+
+                this.ddt._ddt( "htmlarea.js","3930", "activateEditor(): Setting contentEditable to true" );
 
     this._doc.body.contentEditable = true;
     }
+        else
+                {
+                this.ddt._ddt( "htmlarea.js","3930", "activateEditor(): UNHANDLED CASE." );
+
+                // alert( "INTERNAL ERROR - activateEditor - unhandled case" );
+                }
 
   HTMLArea.last_on = this._doc;
@@ -3973 +4102 @@
   {
 
+  if (typeof mode == "undefined") 
+    {
+    mode = ((this._editMode == "textmode") ? "wysiwyg" : "textmode");
+    }
+
   this.ddt._ddt( "htmlarea.js","3975", "setMode(): setting mode to '" + mode + "'" );
 
-  if (typeof mode == "undefined") 
-    {
-    mode = ((this._editMode == "textmode") ? "wysiwyg" : "textmode");
-    }
-
   switch (mode) 
     {
     case "textmode":
       {
+
       var html = this.outwardHtml(this.getHTML());
       this._textArea.value = html;
+
+                        this.ddt._ddt( "htmlarea.js", "3986", "setMode(): textmode. called getHTML composed into outwardHTML and set the textarea value. html set was '" + this.ddt.getHTMLSource(html) + "'" );
 
       // Hide the iframe
@@ -4002 +4134 @@
     case "wysiwyg":
       {
+
+                        this.ddt._ddt( "htmlarea.js", "3986", "setMode(): textmode. calling getHTML composed into inwardHTML and setting the innerHTML or fullpage value." );
+
       var html = this.inwardHtml(this.getHTML());
       this.deactivateEditor();
@@ -4007 +4142 @@
         {
         this._doc.body.innerHTML = html;
+
+                                this.ddt._ddtDumpNode( "htmlarea.js", "3986", "setMode(): wysiwyg. after setting innerHTML body contents are:", this._doc.body );
+
         }
       else
@@ -4012 +4150 @@
         this.setFullHTML(html);
         }
+
       this._iframe.style.display   = '';
       this._textArea.style.display = "none";
@@ -4036 +4175 @@
   // this.focusEditor();
 
+        this.ddt._ddt( "htmlarea.js", "4044", "setMode(): informing any plugins that interested of the mode change" );
+
   for (var i in this.plugins) 
     {
     var plugin = this.plugins[i].instance;
-    if (typeof plugin.onMode == "function") plugin.onMode(mode);
+    if (typeof plugin.onMode == "function") 
+                        {
+                        this.ddt._ddt( "htmlarea.js", "4044", "setMode(): calling onMode in plugin '" + plugin.name + "'" );
+                        plugin.onMode(mode);
+                        }
     }
   };  // end of setMode()
@@ -4099 +4244 @@
   {
 
-  this.ddt._ddt( "htmlarea.js","4101", "registerPlugin(): top" );
-
   var plugin = arguments[0];
+
+  this.ddt._ddt( "htmlarea.js","4101", "registerPlugin(): top with plugin '" + plugin + "'" );
+
   var args = [];
   for (var i = 1; i < arguments.length; ++i)
@@ -4108 +4254 @@
   return this.registerPlugin2(plugin, args);
   };
+
+// -----------------------------------------------------------------
 
 /**
@@ -4124 +4272 @@
 
   if (typeof plugin == "string")
+                {
+          this.ddt._ddt( "htmlarea.js","4123", "registerPlugin2(): plugin '" + plugin + "' is a string." );
     plugin = eval(plugin);
-
-  if (typeof plugin == "undefined") 
-    {
-
-         this.ddt._ddt( "htmlarea.js","4131", "registerPlugin2(): INTERNAL ERROR: plugin is undefined. " );
+                }
+
+  if ((typeof plugin == "undefined") || ( plugin == null ))
+    {
+
+                this.ddt._ddt( "htmlarea.js","4131", "registerPlugin2(): INTERNAL ERROR: plugin is undefined. " );
 
     /* FIXME: This should never happen. But why does it do? */
@@ -4135 +4286 @@
     }
 
-  var obj = new plugin(this, args);
+        // FIXME: in the multiple editor on a page case we sometimes get a null plugin
+        // here ... why?
+
+        try
+                {
+          var obj = new plugin(this, args);
+
+                this.ddt._ddt( "htmlarea.js","4131", "registerPlugin2(): after successfully creating the plugin. " );
+
+                }
+        catch(e)
+                {
+                this.ddt._ddt( "htmlarea.js","4131", "registerPlugin2(): unable to create the plugin. '" + e + "'" );
+
+                alert( "INTERNAL ERROR - registerPlugin2(): UNABLE TO CONSTRUCT PLUGIN '" + plugin + "' - '" + e + "'" );
+
+                return false;
+                }
 
   if (obj) 
@@ -4151 +4319 @@
     } 
   else
+                {
     alert("Can't register plugin " + plugin.toString() + ".");
+                }
 
   };  // end of registerPlugin2
@@ -4419 +4589 @@
         // We don't want to focus the field unless at least one field has been activated.
 
-        if(HTMLArea.last_on)
+        if ( HTMLArea.last_on )
           {
           this.activateEditor();
@@ -4583 +4753 @@
     ancestors = this.getAllAncestors();
     if (this.config.statusBar && !noStatus) 
-           {
+                        {
       this._statusBarTree.innerHTML = HTMLArea._lc("Path") + ": "; // clear
       for (var i = ancestors.length; --i >= 0;) 
-                  {
+                                {
         var el = ancestors[i];
         if (!el) 
-                    {
-
-                         this.ddt._ddt( "htmlarea.js","4593", "updateToolbar(): INTERNAL ERROR" );
+                                        {
+
+                                        this.ddt._ddt( "htmlarea.js","4593", "updateToolbar(): INTERNAL ERROR" );
 
           // hell knows why we get here; this
@@ -4606 +4776 @@
 
         a.onclick = function() 
-                    {
-          this.blur();
-          this.editor.selectNodeContents(this.el);
-          this.editor.updateToolbar(true);
-          return false;
-          };
+                                                                            {
+                                                          this.blur();
+                                                          this.editor.selectNodeContents(this.el);
+                                                          this.editor.updateToolbar(true);
+                                                          return false;
+                                                        };
 
         a.oncontextmenu = function() 
-                    {
-
-          // TODO: add context menu here
-
-          this.blur();
-          var info = "Inline style:\n\n";
-          info += this.el.style.cssText.split(/;\s*/).join(";\n");
-          alert(info);
-          return false;
-          };
+                                                                                                    {
+
+                                                                                  // TODO: add context menu here
+
+                                                                                  this.blur();
+                                                                                  var info = "Inline style:\n\n";
+                                                                                  info += this.el.style.cssText.split(/;\s*/).join(";\n");
+                                                                                  alert(info);
+                                                                                  return false;
+                                                                                  };
 
         var txt = el.tagName.toLowerCase();
         a.title = el.style.cssText;
         if (el.id) 
-                    {
+                            {
           txt += "#" + el.id;
           }
 
         if (el.className) 
-                    {
+                            {
           txt += "." + el.className;
           }
@@ -4640 +4810 @@
         this._statusBarTree.appendChild(a);
         if (i != 0) 
-                    {
+                            {
           this._statusBarTree.appendChild(document.createTextNode(String.fromCharCode(0xbb)));
           }
@@ -4655 +4825 @@
 
     if (btn.context && !text) 
-           {
+                        {
       inContext = false;
       var context = btn.context;
@@ -4661 +4831 @@
 
       if (/(.*)\[(.*?)\]/.test(context)) 
-                  {
+                        {
         context = RegExp.$1;
         attrs = RegExp.$2.split(",");
@@ -4669 +4839 @@
       var match = (context == "*");
       for (var k = 0; k < ancestors.length; ++k) 
-                  {
+                        {
         if (!ancestors[k]) 
-                    {
-
-                         this.ddt._ddt( "htmlarea.js","4675", "updateToolbar(): INTERNAL ERROR" );
+                        {
+
+                                        this.ddt._ddt( "htmlarea.js","4675", "updateToolbar(): INTERNAL ERROR" );
 
           // the impossible really happens.
@@ -4680 +4850 @@
 
         if (match || (ancestors[k].tagName.toLowerCase() == context)) 
-                    {
+                            {
           inContext = true;
           for (var ka = 0; ka < attrs.length; ++ka) 
-                           {
+                                                {
             if (!eval("ancestors[k]." + attrs[ka])) 
-                                  {
+                                                        {
               inContext = false;
               break;
@@ -4692 +4862 @@
 
           if (inContext) 
-                           {
+                                                {
             break;
             }
@@ -4701 +4871 @@
     btn.state("enabled", (!text || btn.text) && inContext);
     if (typeof cmd == "function") 
-           {
+                        {
       continue;
       }
@@ -4709 +4879 @@
     var dropdown = this.config.customSelects[cmd];
     if ((!text || btn.text) && (typeof dropdown != "undefined")) 
-           {
+                        {
       dropdown.refresh(this);
       continue;
@@ -4720 +4890 @@
         {
         if (!text) try 
-                    {
+                                        {
           var value = ("" + doc.queryCommandValue(cmd)).toLowerCase();
 
           if (!value) 
-                           {
+                                                {
             btn.element.selectedIndex = 0;
             break;
@@ -4747 +4917 @@
             }
           btn.element.selectedIndex = 0;
-          } catch(e) {};
+          } 
+                                catch(e) 
+                                        {};
         }
-        break;
+                                
+                        break;
 
       // It's better to search for the format block by tag name from the
@@ -4784 +4957 @@
       case "textindicator":
         if (!text) 
-                    {
-          try {with (btn.element.style) 
-                           {
-            backgroundColor = HTMLArea._makeColor(
-              doc.queryCommandValue(HTMLArea.is_ie ? "backcolor" : "hilitecolor"));
-
-            if (/transparent/i.test(backgroundColor)) 
-                                  {
-              // Mozilla
-              backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("backcolor"));
-              }
-
-            color = HTMLArea._makeColor(doc.queryCommandValue("forecolor"));
-            fontFamily = doc.queryCommandValue("fontname");
-            fontWeight = doc.queryCommandState("bold") ? "bold" : "normal";
-            fontStyle = doc.queryCommandState("italic") ? "italic" : "normal";
-            }} catch (e) 
-                                {
+                        {
+          try 
+                                                {
+                                                with (btn.element.style) 
+                                                        {
+                backgroundColor = HTMLArea._makeColor(
+                doc.queryCommandValue(HTMLArea.is_ie ? "backcolor" : "hilitecolor"));
+
+                    if (/transparent/i.test(backgroundColor)) 
+                                                                {
+                  // Mozilla
+                backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("backcolor"));
+                      }
+
+                  color = HTMLArea._makeColor(doc.queryCommandValue("forecolor"));
+                fontFamily = doc.queryCommandValue("fontname");
+              fontWeight = doc.queryCommandState("bold") ? "bold" : "normal";
+                    fontStyle = doc.queryCommandState("italic") ? "italic" : "normal";
+                  }
+                                                } 
+                                        catch (e) 
+                                                {
             // alert(e + "\n\n" + cmd);
             }
@@ -4807 +4984 @@
         break;
 
-      case "htmlmode": btn.state("active", text); break;
+      case "htmlmode": 
+                        
+                                btn.state("active", text); 
+                                break;
+
       case "lefttoright":
       case "righttoleft":
@@ -4822 +5003 @@
         cmd = cmd.replace(/(un)?orderedlist/i, "insert$1orderedlist");
         try 
-                    {
+                                        {
           btn.state("active", (!text && doc.queryCommandState(cmd)));
-          } catch (e) {}
-      }
+          } 
+                                catch (e) 
+                                        {}
+
+                                break;
+
+                        }       // end of switch
 
     } // end of for loop over toolbar objects
@@ -4836 +5022 @@
     var editor = this;
     this._timerUndo = setTimeout(function() 
-           {
+                        {
       editor._timerUndo = null;
       }, this.config.undoTimeout);
@@ -5754 +5940 @@
 
   this._popupDialog(editor.config.URIs["insert_image"], function(param) 
-    {
+                {
     if (!param) 
-           {    // user must have pressed Cancel
+                        {       // user must have pressed Cancel
       return false;
       }
 
     var img = image;
+
     if (!img) 
-           {
+                        {
       var sel = editor._getSelection();
       var range = editor._createRange(sel);
+
       editor._doc.execCommand("insertimage", false, param.f_url);
+
       if (HTMLArea.is_ie) 
-                  {
+                                {
         img = range.parentElement();
+
         // wonder if this works...
+
         if (img.tagName.toLowerCase() != "img") 
-                    {
-          img = img.previousSibling;
+                            {
+                                        img = img.previousSibling;
           }
         } 
-                else 
-                  {
+                        else 
+                          {
         img = range.startContainer.previousSibling;
         }
       } 
-         else 
-           {
+                else 
+                        {
       img.src = param.f_url;
       }
 
-    for (var field in param) 
-           {
+                for (var field in param) 
+                        {
       var value = param[field];
       switch (field) 
@@ -5954 +6145 @@
   switch (cmdID) 
     {
-    case "htmlmode" : this.setMode(); break;
+    case "htmlmode" : 
+                
+                        this.ddt._ddtDumpNode( "htmlarea.js", "5978", "execCommand(): htmlmode command. Switching modes. Current document is:", this._doc.body );
+                        this.setMode(); 
+
+                        this.ddt._ddtDumpNode( "htmlarea.js", "5978", "execCommand(): htmlmode command. after switch. Document is:", this._doc.body );
+
+                        break;
+
     case "hilitecolor":
       (HTMLArea.is_ie) && (cmdID = "backcolor");
@@ -5962 +6161 @@
                   {
         if (color) 
-                    { // selection not canceled
+                                        { // selection not canceled
           editor._doc.execCommand(cmdID, false, "#" + color);
           }
@@ -5977 +6176 @@
       var win;
       if (HTMLArea.is_ie) 
-                  {
+                                {
           {
           win = window.open(this.popupURL(editor.config.URIs["fullscreen"]), "ha_fullscreen",
               "toolbar=no,location=no,directories=no,status=no,menubar=no," +
               "scrollbars=no,resizable=yes,width=640,height=480");
-           }
+          }
         } 
-                else 
-                  {
+                        else 
+                        {
         win = window.open(this.popupURL(editor.config.URIs["fullscreen"]), "ha_fullscreen",
             "toolbar=no,menubar=no,personalbar=no,width=640,height=480," +
             "scrollbars=no,resizable=yes");
         }
+
       win.focus()
 
@@ -6013 +6213 @@
     case "paste":
       try 
-                  {
+                          {
         this._doc.execCommand(cmdID, UI, param);
         if (this.config.killWordOnPaste)
           this._wordClean();
         } 
-                catch (e) 
-                  {
-        if (HTMLArea.is_gecko) 
-                    {
-          alert(HTMLArea._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
-          }
-        }
+                        catch (e) 
+                          {
+                                if (HTMLArea.is_gecko) 
+                          {
+                                        alert(HTMLArea._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
+                                        }
+                                }
       break;
 
@@ -6036 +6236 @@
 
       if (el) 
-                  {
+                          {
         if (el.style.direction == dir)
           el.style.direction = "";
@@ -6046 +6246 @@
 
     default: 
-           try 
-                  { 
-                  this._doc.execCommand(cmdID, UI, param); 
-                  }
+
+                this.ddt._ddt( "htmlarea.js","6119", "execCommand(): passing '" + cmdID + "' to internal browser command handler." );
+
+                        try 
+                          { 
+                          this._doc.execCommand(cmdID, UI, param); 
+                          }
       catch(e) 
-                  { 
-                  if (this.config.debug) { alert(e + "\n\nby execCommand(" + cmdID + ");"); } 
-                  }
+                          { 
+                          if (this.config.debug) { alert(e + "\n\nby execCommand(" + cmdID + ");"); } 
+                          }
 
     }  // end of switch.
@@ -6066 +6269 @@
 
 /** 
-* _editoEvent()
+* _editorEvent()
 *
 * A generic event handler for things that happen in the IFRAME's document.
@@ -6097 +6300 @@
     }
 
-  if (keyEvent)
-    {
+        if (keyEvent)
+                {
 
     this.ddt._ddt( "htmlarea.js","6102", "_editorEvent(): keyEvent" );
 
-         // loop over all the plugins and pass this event to any that have 
-         // an onKeyPress() method.
+                // loop over all the plugins and pass this event to any that have 
+                // an onKeyPress() method.
 
     for (var i in editor.plugins)
@@ -6109 +6312 @@
       var plugin = editor.plugins[i].instance;
 
-      // to make it easier to figure out what kind of object we're talking to
-                // I've added a name member. This change has not yet been applied to 
-                // all plugins.
-
-           this.ddt._ddtDumpObject( "htmlarea.js","5994", "_editorEvent(): plugin '" + ( plugin.name ? plugin.name : "unknown" ) + "' has members:", plugin );
+                        // to make it easier to figure out what kind of object we're talking to
+                        // I've added a name member. This change has not yet been applied to 
+                        // all plugins.
+
+                        // this.ddt._ddtDumpObject( "htmlarea.js","5994", "_editorEvent(): plugin '" + ( plugin.name ? plugin.name : "unknown" ) + "' has members:", plugin );
+
+                        this.ddt._ddt( "htmlarea.js","5994", "_editorEvent(): plugin '" + ( plugin.name ? plugin.name : "unknown" ) + "'" );
 
       if (typeof plugin.onKeyPress == "function")
-                  {
-
-                  this.ddt._ddt( "htmlarea.js","6120", "_editorEvent(): keyEvent - invoking onKeyPress method in plugin '" + ( plugin.name ? plugin.name : "unknown" ) + "'" );
+                                {
+
+                                this.ddt._ddt( "htmlarea.js","6120", "_editorEvent(): keyEvent - invoking onKeyPress method in plugin '" + ( plugin.name ? plugin.name : "unknown" ) + "'" );
                                                                                                                                                                                                                                                                                                                                  
         if (plugin.onKeyPress(ev))
           {
 
-                         this.ddt._ddt( "htmlarea.js","6125", "_editorEvent(): keyEvent - onKeyPress() returned false. Returning false" );
+                                        this.ddt._ddt( "htmlarea.js","6125", "_editorEvent(): keyEvent - onKeyPress() returned false. Returning false" );
           return false;
-                         }
+                                        }
 
                   } // end of if this plugin had a KeyPress handler.
@@ -6328 +6533 @@
           {
 
-                         this.ddt._ddt( "htmlarea.js","6330", "_editorEvent(): entered a space" );
+                                        this.ddt._ddt( "htmlarea.js","6330", "_editorEvent(): entered a space" );
 
           if(s && s.isCollapsed && s.anchorNode.nodeType == 3 && s.anchorNode.data.length > 3 && s.anchorNode.data.indexOf('.') >= 0)
@@ -6371 +6576 @@
           {
 
-                         this.ddt._ddt( "htmlarea.js","6373", "_editorEvent(): keycode is '" + ev.keyCode + "' which (normal key) is '" + ev.which + "'" );
-
-                         // is it an escape character or ...
+                                        this.ddt._ddt( "htmlarea.js","6373", "_editorEvent(): keycode is '" + ev.keyCode + "' which (normal key) is '" + ev.which + "'" );
+
+                                        // is it an escape character or ...
 
           if(ev.keyCode == 27 || (this._unlinkOnUndo && ev.ctrlKey && ev.which == 122) )
@@ -6387 +6592 @@
             {
 
-                                // backspace or period? 
+                                                // backspace or period? 
 
             this.ddt._ddt( "htmlarea.js","6391", "_editorEvent(): normal key or backspace or period" );
@@ -6395 +6600 @@
             if(s.anchorNode && s.anchorNode.nodeType == 3)
               {
+
               // See if we might be changing a link
               var a = this._getFirstAncestor(s, 'a');
 
               if (!a) 
-                                    {
-                                         this.ddt._ddt( "htmlarea.js","6402", "_editorEvent(): not an anchor" );
-                                         break; // not an anchor
-                                         }
+                                                                {
+                                                                this.ddt._ddt( "htmlarea.js","6402", "_editorEvent(): not an anchor" );
+                                                                break; // not an anchor
+                                                                }
 
               if(!a._updateAnchTimeout)
@@ -6450 +6656 @@
       case 13: // KEY enter
 
-                 this.ddt._ddt( "htmlarea.js","6452", "_editorEvent(): enter key handling" );
+                                this.ddt._ddt( "htmlarea.js","6452", "_editorEvent(): enter key handling" );
 
         if (HTMLArea.is_gecko && !ev.shiftKey && this.config.mozParaHandler == 'dirty' )
@@ -6462 +6668 @@
       case 46: // KEY delete
 
-                 this.ddt._ddt( "htmlarea.js","6464", "_editorEvent(): delete or backspace handling" );
+                                this.ddt._ddt( "htmlarea.js","6464", "_editorEvent(): delete or backspace handling" );
 
         if (HTMLArea.is_gecko && !ev.shiftKey) 
-                    {
+                        {
           if (this.dom_checkBackspace())
             HTMLArea._stopEvent(ev);
           } 
-                  else if (HTMLArea.is_ie) 
-                    {
+                                else if (HTMLArea.is_ie) 
+                        {
           if (this.ie_checkBackspace())
             HTMLArea._stopEvent(ev);
           }
         break;
+
       } // end of switch
     }
@@ -6609 +6816 @@
 
   // Get the insertion point, we'll scrub any highlighted text the user wants rid of while we are there.
+
   var sel = this._getSelection();
   var range = this._createRange(sel);
@@ -6615 +6823 @@
     {
     range.deleteContents();
-    }
-
+    } 
   this.deactivateEditor();
 
@@ -6858 +7065 @@
     case "wysiwyg"  :
       {
+
       if (!this.config.fullPage)
+                                {
         html = HTMLArea.getHTML(this._doc.body, false, this);
+                                }
       else
+                                {
         html = this.doctype + "\n" + HTMLArea.getHTML(this._doc.documentElement, true, this);
+                                }
+
       break;
       }
@@ -7234 +7447 @@
 HTMLArea.prototype._getSelection = function() 
   {
+
+        this.ddt._ddt( "htmlarea.js", "7242", "_getSelection(): top" );
+
   if (HTMLArea.is_ie) 
     {
@@ -7263 +7479 @@
   else 
     {
+
     this.activateEditor();
+
     if (typeof sel != "undefined") 
-           {
+                        {
       try 
-                  {
+                        {
+
+                          this.ddt._ddt( "htmlarea.js","7277", "_createRange(): attempting to create a range using getRangeAt(0) on current selection." );
         return sel.getRangeAt(0);
         } 
-                catch(e) 
-                  {
+                        catch(e) 
+                          {
+                                this.ddt._ddt( "htmlarea.js","7282", "_createRange(): getRangeAt(0) failed, using createRange" );
         return this._doc.createRange();
         }
       } 
     else 
-           {
+                        {
+                        this.ddt._ddt( "htmlarea.js","7292", "_createRange(): creating a new range." );
+
       return this._doc.createRange();
       }

branches/unified_backend/index.html

@@ -66 +66 @@
 
 </p>
-<h2>Unified Backend Branch - snapshot of 2005-04-24</h2>
+<h2>Unified Backend Branch - snapshot of 2005-05-17</h2>
 
 <p>
@@ -101 +101 @@
 <ul><li><a href="./docs/index.html">Programmers Documentation</a></li></ul>
 
-<h2>Status - only partially functional.</h2>
+<h2>Status - core is now mostly functional.</h2>
 <ul>
-<li>Debug trace messages included in htmlarea.js. </li>
+<li>Debug trace messages included in htmlarea.js, linker, imagemanager and enterparagraphs </li>
 <li>Beginnings of code-generated documentation using JSDoc and PHPDoc.</li>
 <li>Beginnings of Configure.php to set up server side environment.</li>
 <li>devutils/ directory containing various scripts</li>
+<li>EnterParagraphs should now largely work</li>
 </ul>
 
 <h2>TODO</h2>
 <ul>
-<li>The unified backend.</li>
 <li>JSDoc/PHPDoc headers in all plugins</li>
-<li>trace messages in plugins</li>
-<li>debug trace message panel - to turn trace messages on/off on a plugin by plugin basis</li>
 <li>buildruntime.php script to strip out comments and trace messages</li>
-<li>fix enterparagraph</li>
 </ul>
 

branches/unified_backend/plugins/EnterParagraphs/enter-paragraphs.js

@@ -1 @@
-// By Adam Wright, for The University of Western Australia
-//
-// Distributed under the same terms as HTMLArea itself.
-// This notice MUST stay intact for use (see license.txt).
-
-function EnterParagraphs(editor) {
-  this.editor = editor;
-  // Activate only if we're talking to Gecko
-  if (HTMLArea.is_gecko)
-    this.onKeyPress = this.__onKeyPress;
-};
-
-EnterParagraphs._pluginInfo = {
+// tabs 2
+
+/**
+* @fileoverview By Adam Wright, for The University of Western Australia
+*
+* Distributed under the same terms as HTMLArea itself.
+* This notice MUST stay intact for use (see license.txt).
+*
+* Heavily modified by Yermo Lamers of DTLink, LLC, College Park, Md., USA.
+* For more info see http://www.areaedit.com
+*/
+
+/**
+* plugin Info
+*/
+
+EnterParagraphs._pluginInfo = 
+        {
   name          : "EnterParagraphs",
   version       : "1.0",
@@ -19 +24 @@
   sponsor_url   : "http://www.uwa.edu.au/",
   license       : "htmlArea"
-};
+        };
+
+// ------------------------------------------------------------------
+
+// "constants"
+
+/**
+* Whitespace Regex
+*/
+
+EnterParagraphs.prototype._whiteSpace = /^\s*$/;
+
+/**
+* The pragmatic list of which elements a paragraph may not contain
+*/
+
+EnterParagraphs.prototype._pExclusions = /^(address|blockquote|body|dd|div|dl|dt|fieldset|form|h1|h2|h3|h4|h5|h6|hr|li|noscript|ol|p|pre|table|ul)$/i;
+
+/**
+* elements which may contain a paragraph
+*/
+
+EnterParagraphs.prototype._pContainers = /^(body|del|div|fieldset|form|ins|map|noscript|object|td|th)$/i;
+
+/**
+* Elements which may not contain paragraphs, and would prefer a break to being split
+*/
+
+EnterParagraphs.prototype._pBreak = /^(address|pre|blockquote)$/i;
+
+/**
+* Elements which may not contain children
+*/
+
+EnterParagraphs.prototype._permEmpty = /^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i;
+
+/**
+* Elements which count as content, as distinct from whitespace or containers
+*/
+
+EnterParagraphs.prototype._elemSolid = /^(applet|br|button|hr|img|input|table)$/i;
+
+/**
+* Elements which should get a new P, before or after, when enter is pressed at either end
+*/
+
+EnterParagraphs.prototype._pifySibling = /^(address|blockquote|del|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|ins|map|noscript|object|ol|p|pre|table|ul|)$/i;
+EnterParagraphs.prototype._pifyForced = /^(ul|ol|dl|table)$/i;
+
+/**
+* Elements which should get a new P, before or after a close parent, when enter is pressed at either end
+*/
+
+EnterParagraphs.prototype._pifyParent = /^(dd|dt|li|td|th|tr)$/i;
+
+// ---------------------------------------------------------------------
+
+/**
+* EnterParagraphs Constructor
+*/
+
+function EnterParagraphs(editor) 
+        {
+
+  this.editor = editor;
+
+        // [STRIP
+        // create a ddt debug trace object. There may be multiple editors on 
+        // the page each EnterParagraphs .. to distinguish which instance
+        // is generating the message we tack on the name of the textarea.
+
+        this.ddt = new DDT( editor._textArea + ":EnterParagraphs Plugin" );
+
+        // uncomment to turn on debugging messages.
+ 
+        this.ddt._ddtOn();
+
+        this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): constructor" );
+
+        // STRIP]
+
+  // hook into the event handler to intercept key presses if we are using
+        // gecko (Mozilla/FireFox)
+
+  if (HTMLArea.is_gecko)
+                {
+                this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): we are gecko. Setting event handler." );
+    this.onKeyPress = this.__onKeyPress;
+                }
+
+        };      // end of constructor.
+
+// ------------------------------------------------------------------
 
 /**
@@ -30 +127 @@
 EnterParagraphs.prototype.name = "EnterParagraphs";
 
-// Whitespace Regex
-EnterParagraphs.prototype._whiteSpace = /^\s*$/;
-// The pragmatic list of which elements a paragraph may not contain, and which may contain a paragraph
-EnterParagraphs.prototype._pExclusions = /^(address|blockquote|body|dd|div|dl|dt|fieldset|form|h1|h2|h3|h4|h5|h6|hr|li|noscript|ol|p|pre|table|ul)$/i;
-EnterParagraphs.prototype._pContainers = /^(body|del|div|fieldset|form|ins|map|noscript|object|td|th)$/i;
-// Elements which may not contain paragraphs, and would prefer a break to being split
-EnterParagraphs.prototype._pBreak = /^(address|pre|blockquote)$/i;
-// Elements which may not contain children
-EnterParagraphs.prototype._permEmpty = /^(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)$/i;
-// Elements which count as content, as distinct from whitespace or containers
-EnterParagraphs.prototype._elemSolid = /^(applet|br|button|hr|img|input|table)$/i;
-// Elements which should get a new P, before or after, when enter is pressed at either end
-EnterParagraphs.prototype._pifySibling = /^(address|blockquote|del|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|ins|map|noscript|object|ol|p|pre|table|ul|)$/i;
-EnterParagraphs.prototype._pifyForced = /^(ul|ol|dl|table)$/i;
-// Elements which should get a new P, before or after a close parent, when enter is pressed at either end
-EnterParagraphs.prototype._pifyParent = /^(dd|dt|li|td|th|tr)$/i;
-
-// Gecko's a bit lacking in some odd ways...
-EnterParagraphs.prototype.insertAdjacentElement = function(ref,pos,el) {
-
-  if ( pos == 'BeforeBegin' ) ref.parentNode.insertBefore(el,ref);
-  else if ( pos == 'AfterEnd' ) ref.nextSibling ? ref.parentNode.insertBefore(el,ref.nextSibling) : ref.parentNode.appendChild(el);
-  else if ( pos == 'AfterBegin' && ref.firstChild ) ref.insertBefore(el,ref.firstChild);
-  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' ) ref.appendChild(el);
-};
-
-// Passes a global parent node or document fragment to forEachNode
-EnterParagraphs.prototype.forEachNodeUnder = function (top, fn, ltr, init, parm) {
+/**
+* Gecko's a bit lacking in some odd ways...
+*/
+
+EnterParagraphs.prototype.insertAdjacentElement = function(ref,pos,el) 
+        {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): top with pos '" + pos + "' ref:", ref );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): top with el:", el );
+
+  if ( pos == 'BeforeBegin' ) 
+                {
+                ref.parentNode.insertBefore(el,ref);
+                }
+  else if ( pos == 'AfterEnd' ) 
+                {
+                ref.nextSibling ? ref.parentNode.insertBefore(el,ref.nextSibling) : ref.parentNode.appendChild(el);
+                }
+  else if ( pos == 'AfterBegin' && ref.firstChild ) 
+                {
+                ref.insertBefore(el,ref.firstChild);
+                }
+  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' ) 
+                {
+                ref.appendChild(el);
+                }
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): bottom with ref:", ref );
+
+        };      // end of insertAdjacentElement()
+
+// ----------------------------------------------------------------
+
+/**
+* Passes a global parent node or document fragment to forEachNode
+*
+* @param root node root node to start search from.
+* @param mode string function to apply to each node.
+* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
+* @param init boolean
+*/
+
+EnterParagraphs.prototype.forEachNodeUnder = function ( root, mode, direction, init ) 
+        {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): top mode is '" + mode + "' direction is '" + direction + "' starting with root node:", root );
 
   // Identify the first and last nodes to deal with
+        
   var start, end;
-  if ( top.nodeType == 11 && top.firstChild ) {
-    start = top.firstChild;
-    end = top.lastChild;
-  } else start = end = top;
-  while ( end.lastChild ) end = end.lastChild;
-
-  // Pass onto forEachNode
-  return this.forEachNode(start, end, fn, ltr, init, parm);
-};
-
-// Throws each node into a function
-EnterParagraphs.prototype.forEachNode = function (left, right, fn, ltr, init, parm) {
-
-  var xBro = function(elem, ltr) { return ( ltr ? elem.nextSibling : elem.previousSibling ); };
-  var xSon = function(elem, ltr) { return ( ltr ? elem.firstChild : elem.lastChild ); };
-  var walk, lookup, fnVal, ping = init;
-
-  // Until we've hit the last node
-  while ( walk != ltr ? right : left ) {
-
-    // Progress to the next node
-    if ( !walk ) walk = ltr ? left : right;
-    else {
-      if ( xSon(walk,ltr) ) walk = xSon(walk,ltr);
-      else {
-        if ( xBro(walk,ltr) ) walk = xBro(walk,ltr);
-        else {
+
+        // nodeType 11 is DOCUMENT_FRAGMENT_NODE which is a container. 
+
+  if ( root.nodeType == 11 && root.firstChild ) 
+                {
+    start = root.firstChild;
+    end = root.lastChild;
+          } 
+        else 
+                {
+                start = end = root;
+                }
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): start node is:", start );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): initial end node is:", end );
+
+        // traverse down the right hand side of the tree getting the last child of the last
+        // child in each level until we reach bottom.
+  while ( end.lastChild ) 
+                end = end.lastChild;
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): end node after descent is:", end );
+
+  return this.forEachNode( start, end, mode, direction, init);
+
+        };      // end of forEachNodeUnder()
+
+// -----------------------------------------------------------------------
+
+/**
+* perform a depth first descent in the direction requested.
+*
+* @param left_node node "start node"
+* @param right_node node "end node"
+* @param mode string function to apply to each node. cullids or emptyset.
+* @param direction string traversal direction "ltr" (left to right) or "rtl" (right_to_left)
+* @param init boolean or object.
+*/
+
+EnterParagraphs.prototype.forEachNode = function (left_node, right_node, mode, direction, init) 
+        {
+
+        this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): top - mode is:" + mode + "' direction '" + direction + "'" );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): top - left node is:", left_node );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): top - right node is:", right_node );
+
+        // returns "Brother" node either left or right.
+
+  var getSibling = function(elem, direction) 
+                                                        { 
+                                                        return ( direction == "ltr" ? elem.nextSibling : elem.previousSibling ); 
+                                                        };
+
+  var getChild = function(elem, direction) 
+                                                        { 
+                                                        return ( direction == "ltr" ? elem.firstChild : elem.lastChild ); 
+                                                        };
+
+  var walk, lookup, fnReturnVal;
+
+        // FIXME: init is a boolean in the emptyset case and an object in 
+        // the cullids case. Used inconsistently.
+                
+        var next_node = init;
+
+        // used to flag having reached the last node.
+
+        var done_flag = false;
+
+  // loop ntil we've hit the last node in the given direction.
+        // if we're going left to right that's the right_node and visa-versa.
+
+  while ( walk != direction == "ltr" ? right_node : left_node ) 
+                {
+
+    // on first entry, walk here is null. So this is how 
+                // we prime the loop with the first node.
+
+    if ( !walk ) 
+                        {
+                        walk = direction == "ltr" ? left_node : right_node;
+
+                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): !walk - current node is:", walk );
+                        }
+    else 
+                        {
+
+                        // is there a child node?
+
+      if ( getChild(walk,direction) ) 
+                                {
+
+                                // descend down into the child.
+
+                                walk = getChild(walk,direction);
+
+                                this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode():descending to child node:", walk );
+
+                                }
+      else 
+                                {
+
+                                // is there a sibling node on this level?
+
+        if ( getSibling(walk,direction) ) 
+                                        {
+
+                                        // move to the sibling.
+
+                                        walk = getSibling(walk,direction);
+
+                                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): moving to sibling node:", walk );
+
+                                        }
+        else 
+                                        {
           lookup = walk;
-          while ( !xBro(lookup,ltr) && lookup != (ltr ? right : left) ) lookup = lookup.parentNode;
-          walk = ( lookup.nextSibling ? lookup.nextSibling : lookup ) ;
-          if ( walk == right ) break;
-    }   }       }
-
-    fnVal = fn(this, walk, ping, parm, (walk==(ltr?right:left)));       // Throw this node at the wanted function
-    if ( fnVal[0] ) return fnVal[1];                                                            // If this node wants us to return, return pong
-    if ( fnVal[1] ) ping = fnVal[1];                                                            // Otherwise, set pong to ping, to pass to the next node
-  }
+
+                                        // climb back up the tree until we find a level where we are not the end 
+                                        // node on the level (i.e. that we have a sibling in the direction
+                                        // we are searching) or until we reach the end.
+
+          while ( !getSibling(lookup,direction) && lookup != (direction == "ltr" ? right_node : left_node) ) 
+                                                {
+                                                lookup = lookup.parentNode;
+                                                }
+
+                                        // did we find a level with a sibling? 
+
+          // walk = ( lookup.nextSibling ? lookup.nextSibling : lookup ) ;
+
+          walk = ( getSibling(lookup,direction) ? getSibling(lookup,direction) : lookup ) ;
+
+                                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): climbed back up (or found right node):", walk );
+                                        
+                            }   
+                                }       
+
+                        }       // end of else walk.
+
+                // have we reached the end? either as a result of the top while loop or climbing
+                // back out above.
+
+                done_flag = (walk==( direction == "ltr" ? right_node : left_node));
+
+                // call the requested function on the current node. Functions
+                // return an array. 
+                //
+                // Possible functions are _fenCullIds, _fenEmptySet
+                //
+                // The situation is complicated by the fact that sometimes we want to
+                // return the base node and sometimes we do not.
+                //
+                // next_node can be an object (this.takenIds), a node (text, el, etc) or false.
+
+                this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): calling function" );
+
+                switch( mode )
+                        {
+
+                        case "cullids":
+
+                fnReturnVal = this._fenCullIds(walk, next_node );       
+                                break;
+
+                        case "find_fill":
+
+                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);      
+                                break;
+
+                        case "find_cursorpoint":
+
+                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);      
+                                break;
+
+                        }
+
+                // If this node wants us to return, return next_node
+
+    if ( fnReturnVal[0] ) 
+                        {
+                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): returning node:", fnReturnVal[1] );
+
+                        return fnReturnVal[1];                                                          
+                        }
+
+                // are we done with the loop? 
+
+                if ( done_flag )
+                        {
+                        break;
+                        }
+
+                // Otherwise, pass to the next node
+
+    if ( fnReturnVal[1] ) 
+                        {
+                        next_node = fnReturnVal[1];                                                             
+                        }
+
+          }     // end of while loop
+
+        this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): returning false." );
+
   return false;
-};
-
-// forEachNode fn: Find a post-insertion node, only if all nodes are empty, or the first content
-EnterParagraphs.prototype._fenEmptySet = function (parent, node, pong, getCont, last) {
+
+        };      // end of forEachNode()
+
+// -------------------------------------------------------------------
+
+/**
+* Find a post-insertion node, only if all nodes are empty, or the first content
+*
+* @param node node current node beinge examined.
+* @param next_node node next node to be examined.
+* @param node string "find_fill" or "find_cursorpoint"
+* @param last_flag boolean is this the last node? 
+*/
+
+EnterParagraphs.prototype._fenEmptySet = function( node, next_node, mode, last_flag) 
+        {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : top with mode '" + mode + "' and last_flag '" + last_flag + "' and node:", node );
 
   // Mark this if it's the first base
-  if ( !pong && !node.firstChild ) pong = node;
-
-  // Check for content
-  if ( (node.nodeType == 1 && parent._elemSolid.test(node.nodeName)) ||
-    (node.nodeType == 3 && !parent._whiteSpace.test(node.nodeValue)) ||
-    (node.nodeType != 1 && node.nodeType != 3) ) {
-
-    return new Array(true, (getCont?node:false));
-  }
-
-  // Only return the 'base' node if we didn't want content
-  if ( last && !getCont ) return new Array(true, pong);
-  return new Array(false, pong);
-};
-
-// forEachNode fn:
-EnterParagraphs.prototype._fenCullIds = function (parent, node, pong, parm, last) {
+
+  if ( !next_node && !node.firstChild ) 
+                {
+                next_node = node;
+                }
+
+  // Is it an element node and is it considered content? (br, hr, etc)
+        // or is it a text node that is not just whitespace?
+        // or is it not an element node and not a text node?
+
+  if ( (node.nodeType == 1 && this._elemSolid.test(node.nodeName)) ||
+    (node.nodeType == 3 && !this._whiteSpace.test(node.nodeValue)) ||
+    (node.nodeType != 1 && node.nodeType != 3) ) 
+                {
+
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : found content in node:", node );
+
+                switch( mode )
+                        {
+
+                        case "find_fill":
+
+                                // does not return content.
+
+                    return new Array(true, false );
+                                breal;
+
+                        case "find_cursorpoint":
+                                
+                                // returns content
+
+                    return new Array(true, node );
+                                break;
+
+                        }
+
+          }
+
+  // In either case (fill or findcursor) we return the base node. The avoids
+        // problems in terminal cases (beginning or end of document or container tags)
+
+  if ( last_flag )
+                {
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : return 'base' node:", next_node );
+
+                return new Array( true, next_node );
+                }
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : bottom returning false and :", next_node );
+
+  return new Array( false, next_node );
+
+        };      // end of _fenEmptySet()
+
+// ------------------------------------------------------------------------------
+
+/**
+* remove duplicate Id's. 
+*
+* @param ep_ref enterparagraphs reference to enterparagraphs object
+*/
+
+EnterParagraphs.prototype._fenCullIds = function ( ep_ref, node, pong ) 
+        {
+
+        this.ddt._ddt( "enter-paragraphs.js", "299", "_fenCullIds(): top" );
 
   // Check for an id, blast it if it's in the store, otherwise add it
-  if ( node.id ) pong[node.id] ? node.id = '' : pong[node.id] = true;
+
+  if ( node.id ) 
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "299", "_fenCullIds(): node '" + node.nodeName + "' has an id '" + node.id + "'" );
+
+                pong[node.id] ? node.id = '' : pong[node.id] = true;
+                }
+
   return new Array(false,pong);
-};
-
-// Grabs a range suitable for paragraph stuffing
-EnterParagraphs.prototype.processSide = function(rng, left) {
-
-  var next = function(element, left) { return ( left ? element.previousSibling : element.nextSibling ); };
-  var node = left ? rng.startContainer : rng.endContainer;
-  var offset = left ? rng.startOffset : rng.endOffset;
+
+        };
+
+// ---------------------------------------------------------------------------------
+
+/**
+* Grabs a range suitable for paragraph stuffing
+*
+* @param rng Range
+* @param search_direction string "left" or "right" 
+*
+* @todo check blank node issue in roaming loop.
+*/
+
+EnterParagraphs.prototype.processSide = function( rng, search_direction) 
+        {
+
+        this.ddt._ddt( "enter-paragraphs.js", "329", "processSide(): top search_direction == '" + search_direction + "'" );
+
+  var next = function(element, search_direction) 
+                                                        { 
+                                                        return ( search_direction == "left" ? element.previousSibling : element.nextSibling ); 
+                                                        };
+
+  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
+  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
   var roam, start = node;
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "337", "processSide(): starting with node:", node );
 
   // Never start with an element, because then the first roaming node might
   // be on the exclusion list and we wouldn't know until it was too late
-  while ( start.nodeType == 1 && !this._permEmpty.test(start.nodeName) ) start = ( offset ? start.lastChild : start.firstChild );
+
+  while ( start.nodeType == 1 && !this._permEmpty.test(start.nodeName) ) 
+                {
+                start = ( offset ? start.lastChild : start.firstChild );
+                }
 
   // Climb the tree, left or right, until our course of action presents itself
-  while ( roam = roam ? ( next(roam,left) ? next(roam,left) : roam.parentNode ) : start ) {
-
-    if ( next(roam,left) ) {
+        //
+        // if roam is NULL try start.
+        // if roam is NOT NULL, try next node in our search_direction
+        // If that node is NULL, get our parent node.
+        //
+        // If all the above turns out NULL end the loop.
+        //
+        // FIXME: gecko (firefox 1.0.3) - enter "test" into an empty document and press enter.
+        // sometimes this loop finds a blank text node, sometimes it doesn't.
+
+  while ( roam = roam ? ( next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode ) : start )
+                {
+
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "357", "processSide(): roaming loop, search_direction is '" + search_direction + "' current node is: ", roam );
+
+                // next() is an inline function defined above that returns the next node depending
+                // on the direction we're searching.
+
+    if ( next(roam,search_direction) ) 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Checking next node '" + next(roam,search_direction).NodeName + "' for _pExclusions list." );
+
       // If the next sibling's on the exclusion list, stop before it
-      if ( this._pExclusions.test(next(roam,left).nodeName) ) {
-        return this.processRng(rng, left, roam, next(roam,left), (left?'AfterEnd':'BeforeBegin'), true, false);
-    } } else {
+
+      if ( this._pExclusions.test(next(roam,search_direction).nodeName) ) 
+                                {
+
+                                this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Node '" + next(roam,search_direction).NodeName + "' is on the _pExclusions list. Stopping before it." );
+
+        return this.processRng(rng, search_direction, roam, next(roam,search_direction), (search_direction == "left"?'AfterEnd':'BeforeBegin'), true, false);
+                    } 
+                        } 
+                else 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): No next node, examing parent node '" + roam.parentNode.nodeName + "' for containers or exclusions." );
+
       // If our parent's on the container list, stop inside it
-      if (this._pContainers.test(roam.parentNode.nodeName)) {
-        return this.processRng(rng, left, roam, roam.parentNode, (left?'AfterBegin':'BeforeEnd'), true, false);
-      }
-      // If our parent's on the exclusion list, chop without wrapping
-      else if (this._pExclusions.test(roam.parentNode.nodeName)) {
-        if (this._pBreak.test(roam.parentNode.nodeName)) {
-          return this.processRng(rng, left, roam, roam.parentNode,
-                            (left?'AfterBegin':'BeforeEnd'), false, (left?true:false));
-        } else {
-          return this.processRng(rng, left, (roam = roam.parentNode),
-                            (next(roam,left) ? next(roam,left) : roam.parentNode),
-              (next(roam,left) ? (left?'AfterEnd':'BeforeBegin') : (left?'AfterBegin':'BeforeEnd')), false, false);
-}       }       }       }       };
-
-// Neighbour and insertion identify where the new node, roam, needs to enter
-// the document; landmarks in our selection will be deleted before insertion
-EnterParagraphs.prototype.processRng = function(rng, left, roam, neighbour, insertion, pWrap, preBr) {
-
-  var node = left ? rng.startContainer : rng.endContainer;
-  var offset = left ? rng.startOffset : rng.endOffset;
+
+      if (this._pContainers.test(roam.parentNode.nodeName)) 
+                                {
+
+                                this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pContainer list. Stopping inside it." );
+
+        return this.processRng(rng, search_direction, roam, roam.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), true, false);
+              }
+      else if (this._pExclusions.test(roam.parentNode.nodeName)) 
+                                {
+
+                                this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pExclusion list." );
+
+              // chop without wrapping
+
+        if (this._pBreak.test(roam.parentNode.nodeName)) 
+                                        {
+
+                                        this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is on the _pBreak list." );
+
+          return this.processRng(rng, search_direction, roam, roam.parentNode,
+                            (search_direction == "left"?'AfterBegin':'BeforeEnd'), false, (search_direction == "left" ?true:false));
+                } 
+                                else 
+                                        {
+
+                                        this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is not on the _pBreak list." );
+
+                                        // the next(roam,search_direction) in this call is redundant since we know it's false
+                                        // because of the "if next(roam,search_direction)" above.
+                                        //
+                                        // the final false prevents this range from being wrapped in <p>'s most likely
+                                        // because it's already wrapped.
+
+          return this.processRng(rng, 
+                                                                                                                                search_direction, 
+                                                                                                                                (roam = roam.parentNode),
+                                            (next(roam,search_direction) ? next(roam,search_direction) : roam.parentNode),
+                                                                                      (next(roam,search_direction) ? (search_direction == "left"?'AfterEnd':'BeforeBegin') : (search_direction == "left"?'AfterBegin':'BeforeEnd')), 
+                                                                                                                                false, 
+                                                                                                                                false);
+                                        }       
+                                }       
+                        }       
+                }       
+
+        this.ddt._ddt( "enter-paragraphs.js", "424", "processSide(): bottom" );
+
+        };      // end of processSide()
+
+// ------------------------------------------------------------------------------
+
+/**
+* processRng - process Range.
+*
+* Neighbour and insertion identify where the new node, roam, needs to enter
+* the document; landmarks in our selection will be deleted before insertion
+*
+* @param rn Range original selected range
+* @param search_direction string Direction to search in.
+* @param roam node 
+* @param insertion string may be AfterBegin of BeforeEnd
+* @return array
+*/
+
+EnterParagraphs.prototype.processRng = function(rng, search_direction, roam, neighbour, insertion, pWrap, preBr) 
+        {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "398", "processRng(): top - roam arg is:", roam );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "398", "processRng(): top - neighbor arg is:", neighbour );
+
+        this.ddt._ddt( "enter-paragraphs.js", "398", "processRng(): top - insertion arg is: '" + insertion + "'" );
+
+  var node = search_direction == "left" ? rng.startContainer : rng.endContainer;
+  var offset = search_direction == "left" ? rng.startOffset : rng.endOffset;
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "447", "processRng(): range start (or end) is at offset '" + offset + "' is node :", node );
 
   // Define the range to cut, and extend the selection range to the same boundary
+
   var editor = this.editor;
   var newRng = editor._doc.createRange();
+
   newRng.selectNode(roam);
-  if (left) {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): selecting newRng is:", newRng );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): selecting original rng is:", rng );
+
+        // extend the range in the given direction.
+
+  if ( search_direction == "left")
+                {
     newRng.setEnd(node, offset);
     rng.setStart(newRng.startContainer, newRng.startOffset);
-  } else {
+
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): extending direction left - newRng is:", newRng );
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): extending direction left - rng is:", rng );
+
+          } 
+        else if ( search_direction == "right" )
+                {
+
     newRng.setStart(node, offset);
-    rng.setEnd(newRng.endContainer, newRng.endOffset);
-  }
+                rng.setEnd(newRng.endContainer, newRng.endOffset);
+
+                this.ddt._ddt( "enter-paragraphs.js", "522", "processRng(): right - new range start is '" + offset + "' end offset is '" + newRng.endOffset + "'" );
+          }
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): rng is:", rng );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "522", "processRng(): newRng is:", newRng );
 
   // Clone the range and remove duplicate ids it would otherwise produce
+
   var cnt = newRng.cloneContents();
-  this.forEachNodeUnder(cnt, this._fenCullIds, true, this.takenIds, false);
-
-  // Special case, for inserting paragraphs before some blocks when caret is at their zero offset
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "509", "processRng(): culling duplicate ids from:", cnt );
+
+        // in this case "init" is an object not a boolen.
+
+  this.forEachNodeUnder( cnt, "cullids", "ltr", this.takenIds, false, false);
+
+  // Special case, for inserting paragraphs before some blocks when caret is at 
+        // their zero offset. 
+        //
+        // Used to "open up space" in front of a list, table. Usefull if the list is at
+        // the top of the document. (otherwise you'd have no way of "moving it down").
+
   var pify, pifyOffset, fill;
-  pify = left ? (newRng.endContainer.nodeType == 3 ? true:false) : (newRng.startContainer.nodeType == 3 ? false:true);
+  pify = search_direction == "left" ? (newRng.endContainer.nodeType == 3 ? true:false) : (newRng.startContainer.nodeType == 3 ? false:true);
   pifyOffset = pify ? newRng.startOffset : newRng.endOffset;
   pify = pify ? newRng.startContainer : newRng.endContainer;
 
-  if ( this._pifyParent.test(pify.nodeName) && pify.parentNode.childNodes.item(0) == pify ) {
-    while ( !this._pifySibling.test(pify.nodeName) ) pify = pify.parentNode;
-  }
-
-  if ( cnt.nodeType == 11 && !cnt.firstChild ) cnt.appendChild(editor._doc.createElement(pify.nodeName));
-  fill = this.forEachNodeUnder(cnt,this._fenEmptySet,true,false,false);
-
-  if ( fill && this._pifySibling.test(pify.nodeName) &&
-    ( (pifyOffset == 0) || ( pifyOffset == 1 && this._pifyForced.test(pify.nodeName) ) ) ) {
-
-    roam = editor._doc.createElement('p');
-    roam.appendChild(editor._doc.createElement('br'));
-
-    if (left && pify.previousSibling) return new Array(pify.previousSibling, 'AfterEnd', roam);
-    else if (!left && pify.nextSibling) return new Array(pify.nextSibling, 'BeforeBegin', roam);
-    else return new Array(pify.parentNode, (left?'AfterBegin':'BeforeEnd'), roam);
-  }
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "521", "processRng(): pify is '" + pify.nodeName + "' pifyOffset is '" + pifyOffset + "':", pify );
+
+  if ( this._pifyParent.test(pify.nodeName) && pify.parentNode.childNodes.item(0) == pify ) 
+                {
+    while ( !this._pifySibling.test(pify.nodeName) ) 
+                        {
+                        pify = pify.parentNode;
+                        }
+          }
+
+        // NODE TYPE 11 is DOCUMENT_FRAGMENT NODE
+
+  if ( cnt.nodeType == 11 && !cnt.firstChild ) 
+                {
+                cnt.appendChild(editor._doc.createElement(pify.nodeName));
+                }
+
+        // YmL: Added additional last parameter for fill case to work around logic
+        // error in forEachNode()
+
+        this.ddt._ddt( "enter-paragraphs.js", "612", "processRng(): find_fill in cnt." );
+
+  fill = this.forEachNodeUnder(cnt, "find_fill", "ltr", false );
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "612", "processRng(): fill node:" , fill );
+
+  if ( fill && 
+                                this._pifySibling.test(pify.nodeName) &&
+                ( (pifyOffset == 0) || ( pifyOffset == 1 && this._pifyForced.test(pify.nodeName) ) ) ) 
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "544", "processRng(): pify handling. Creating p tag followed by nbsp tag" );
+
+                roam = editor._doc.createElement( 'p' );
+                roam.innerHTML = "&nbsp;";
+
+    // roam = editor._doc.createElement('p');
+    // roam.appendChild(editor._doc.createElement('br'));
+
+                // for these cases, if we are processing the left hand side we want it to halt
+                // processing instead of doing the right hand side. (Avoids adding another <p>&nbsp</p>
+                // after the list etc.
+
+    if ((search_direction == "left" ) && pify.previousSibling) 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam AfterEnd" );
+
+                        return new Array(pify.previousSibling, 'AfterEnd', roam);
+                        }
+    else if (( search_direction == "right") && pify.nextSibling) 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam BeforeBegin" );
+
+                        return new Array(pify.nextSibling, 'BeforeBegin', roam);
+                        }
+    else 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam for direction '" + search_direction + "'" );
+
+                        return new Array(pify.parentNode, (search_direction == "left"?'AfterBegin':'BeforeEnd'), roam);
+                        }
+
+          }
 
   // If our cloned contents are 'content'-less, shove a break in them
-  if ( fill ) {
-    if ( fill.nodeType == 3 ) fill = fill.parentNode;           // Ill-concieved?
-    if ( (fill.nodeType == 1 && !this._elemSolid.test()) || fill.nodeType == 11 ) fill.appendChild(editor._doc.createElement('br'));
-    else fill.parentNode.insertBefore(editor._doc.createElement('br'),fill);
-  }
-
-  // And stuff a shiny new object with whatever contents we have
-  roam = (pWrap || (cnt.nodeType == 11 && !cnt.firstChild)) ? editor._doc.createElement('p') : editor._doc.createDocumentFragment();
-  roam.appendChild(cnt);
-  if (preBr) roam.appendChild(editor._doc.createElement('br'));
+
+  if ( fill ) 
+                {
+
+                // Ill-concieved? 
+                //
+                // 3 is a TEXT node and it should be empty.
+                // 
+
+                if ( fill.nodeType == 3 ) 
+                        {
+                        // fill = fill.parentNode;              
+
+                        fill = editor._doc.createDocumentFragment();
+
+                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "575", "processRng(): fill.nodeType is 3. Moving up to parent:", fill );
+                        }
+
+    if ( (fill.nodeType == 1 && !this._elemSolid.test()) || fill.nodeType == 11 ) 
+                        {
+
+                        // FIXME:/CHECKME: When Xinha is switched from WYSIWYG to text mode 
+                        // HTMLArea.getHTMLWrapper() will strip out the trailing br. Not sure why.
+
+                        // fill.appendChild(editor._doc.createElement('br'));
+
+                        var pterminator = editor._doc.createElement( 'p' );
+                        pterminator.innerHTML = "&nbsp;";
+
+                        fill.appendChild( pterminator );
+                         
+                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "583", "processRng(): fill type is 1 and !elemsolid or it's type 11. Appending an nbsp tag:", fill );
+
+                        }
+    else 
+                        {
+
+                        this.ddt._ddt( "enter-paragraphs.js", "583", "processRng(): inserting a br tag before." );
+
+                        // fill.parentNode.insertBefore(editor._doc.createElement('br'),fill);
+
+                        var pterminator = editor._doc.createElement( 'p' );
+                        pterminator.innerHTML = "&nbsp;";
+
+                        fill.parentNode.insertBefore(parentNode,fill);
+
+                        }
+          }
+
+        // YmL: If there was no content replace with fill
+        // (previous code did not use fill and we ended up with the
+        // <p>test</p><p></p> because Gecko was finding two empty text nodes 
+        // when traversing on the right hand side of an empty document.
+
+        if ( fill )
+                {
+
+                this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): no content. Using fill.", fill );
+
+                roam = fill;
+                }
+        else
+                {
+          // And stuff a shiny new object with whatever contents we have
+
+                this.ddt._ddt( "enter-paragraphs.js", "606", "processRng(): creating p tag or document fragment - pWrap is '" + pWrap + "' " );
+        
+          roam = (pWrap || (cnt.nodeType == 11 && !cnt.firstChild)) ? editor._doc.createElement('p') : editor._doc.createDocumentFragment();
+          roam.appendChild(cnt);
+                }
+
+  if (preBr) 
+                {
+                this.ddt._ddt( "enter-paragraphs.js", "767", "processRng(): appending a br based on preBr flag" );
+
+                roam.appendChild(editor._doc.createElement('br'));
+                }
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): bottom with roam:", roam );
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): bottom with neighbour:", neighbour );
 
   // Return the nearest relative, relative insertion point and fragment to insert
+
   return new Array(neighbour, insertion, roam);
-};
-
-// Called when a key is pressed in the editor
-EnterParagraphs.prototype.__onKeyPress = function(ev) {
-
-  // If they've hit enter and shift is up, take it
+
+        };      // end of processRng()
+
+// ----------------------------------------------------------------------------------
+
+/**
+* are we an <li> that should be handled by the browser?
+*
+* there is no good way to "get out of" ordered or unordered lists from Javascript.
+* We have to pass the onKeyPress 13 event to the browser so it can take care of
+* getting us "out of" the list. 
+*
+* The Gecko engine does a good job of handling all the normal <li> cases except the "press 
+* enter at the first position" where we want a <p>&nbsp</p> inserted before the list. The
+* built-in behavior is to open up a <li> before the current entry (not good).
+* 
+* @param rng Range range.
+*/
+
+EnterParagraphs.prototype.isNormalListItem = function(rng)
+        {
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "863", "isNormaListItem(): checking rng for list end:", rng );
+
+        var node, listNode;
+
+        node = rng.startContainer;
+
+        if (( typeof node.nodeName != 'undefined') &&
+                ( node.nodeName.toLowerCase() == 'li' ))
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): node is a list item");
+
+                // are we a list item?
+
+                listNode = node;
+                }
+        else if (( typeof node.parentNode != 'undefined' ) &&
+                                ( typeof node.parentNode.nodeName != 'undefined' ) &&
+                                ( node.parentNode.nodeName.toLowerCase() == 'li' ))
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): parent is a list item");
+                        
+                // our parent is a list item.
+
+                listNode = node.parentNode;
+
+                }
+        else
+                {
+                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): not list item");
+
+                // neither we nor our parent are a list item. this is not a normal
+                // li case.
+
+                return false;
+                }
+
+        // at this point we have a listNode. Is it the first list item? 
+
+        if ( ! listNode.previousSibling )
+                {
+                this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): we are the first li." );
+
+                // are we on the first character of the first li? 
+
+                if ( rng.startOffset == 0 )
+                        {
+                        this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): we are on the first character." );
+
+                        return false;
+                        }
+                }
+
+        this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): this is a normal list item case." );
+        return true;
+
+        };      // end of isNormalListItem()
+
+// ----------------------------------------------------------------------------------
+/**                                                      
+* Called when a key is pressed in the editor
+*/
+
+EnterParagraphs.prototype.__onKeyPress = function(ev) 
+        {
+
+        this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): top with keyCode '" + ev.keyCode + "'" );
+
+  // If they've hit enter and shift is not pressed, handle it
+
   if (ev.keyCode == 13 && !ev.shiftKey && this.editor._iframe.contentWindow.getSelection)
+                {
+                this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): calling handleEnter" );
+
     return this.handleEnter(ev);
-};
-
-// Handles the pressing of an unshifted enter for Gecko
-EnterParagraphs.prototype.handleEnter = function(ev) {
+                }
+
+        this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): bottom" );
+
+        };      // end of _onKeyPress()
+
+// -----------------------------------------------------------------------------------
+
+/**
+* Handles the pressing of an unshifted enter for Gecko
+*/
+
+EnterParagraphs.prototype.handleEnter = function(ev) 
+        {
+
+        this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): top" );
+
+        var cursorNode;
 
   // Grab the selection and associated range
+
   var sel = this.editor._getSelection();
   var rng = this.editor._createRange(sel);
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): initial range is: ", rng );
+
+        // if we are at the end of a list and the node is empty let the browser handle
+        // it to get us out of the list.
+
+        if ( this.isNormalListItem(rng) )
+                {
+                this.ddt._ddt( "enter-paragraphs.js", "757", "handleEnter(): we are at the end of a list with a blank item. Letting the browser handle it." );
+                return true;
+                }
+
+        // as far as I can tell this isn't actually used. 
+
   this.takenIds = new Object();
 
   // Grab ranges for document re-stuffing, if appropriate
-  var pStart = this.processSide(rng, true);
-  var pEnd = this.processSide(rng, false);
+        //
+        // pStart and pEnd are arrays consisting of
+        // [0] neighbor node
+        // [1] insertion type
+        // [2] roam
+
+        this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): calling processSide on left side." );
+
+  var pStart = this.processSide(rng, "left");
+
+        this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): after processing left side range is: ", rng );
+
+        this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): calling processSide on right side." );
+
+        var pEnd = this.processSide(rng, "right");
+
+        // used to position the cursor after insertion.
+
+        cursorNode = pEnd[2];
 
   // Get rid of everything local to the selection
+
   sel.removeAllRanges();
   rng.deleteContents();
 
-  // Grab a node we'll have after insertion, since fragments will be lost
-  var holdEnd = this.forEachNodeUnder(pEnd[2], this._fenEmptySet, true, false, true);
-
-  // Reinsert our carefully chosen document fragments
-  if ( pStart ) this.insertAdjacentElement(pStart[0], pStart[1], pStart[2]);
-  if ( pEnd.nodeType != 1 ) this.insertAdjacentElement(pEnd[0], pEnd[1], pEnd[2]);
+        // Grab a node we'll have after insertion, since fragments will be lost
+        //
+        // we'll use this to position the cursor.
+
+        this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looking for cursor position" );
+
+  var holdEnd = this.forEachNodeUnder( cursorNode, "find_cursorpoint", "ltr", false, true);
+
+        if ( ! holdEnd )
+                {
+                alert( "INTERNAL ERROR - could not find place to put cursor after ENTER" );
+                }
+
+  // Insert our carefully chosen document fragments
+
+  if ( pStart ) 
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
+
+                this.insertAdjacentElement(pStart[0], pStart[1], pStart[2]);
+                }
+
+  if ( pEnd && pEnd.nodeType != 1) 
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
+
+                this.insertAdjacentElement(pEnd[0], pEnd[1], pEnd[2]);
+                }
 
   // Move the caret in front of the first good text element
-  if ( this._permEmpty.test(holdEnd.nodeName) ) {
+
+  if ((holdEnd) && (this._permEmpty.test(holdEnd.nodeName) )) 
+                {
+
+                this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looping to find cursor element." );
+
     var prodigal = 0;
-    while ( holdEnd.parentNode.childNodes.item(prodigal) != holdEnd ) prodigal++;
+    while ( holdEnd.parentNode.childNodes.item(prodigal) != holdEnd ) 
+                        {
+                        prodigal++;
+                        }
+
     sel.collapse( holdEnd.parentNode, prodigal);
-  }
-  else sel.collapse(holdEnd, 0);
-  this.editor.scrollToElement(holdEnd);
+          }
+  else 
+                {
+
+                // holdEnd might be false.
+
+                try 
+                        {
+                        sel.collapse(holdEnd, 0);
+
+                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "1057", "handleEnter(): scrolling to element:", holdEnd );
+
+                        // interestingly, scrollToElement() scroll so the top if holdEnd is a text node. 
+                        
+                        if ( holdEnd.nodeType == 3 )
+                                {
+                                holdEnd = holdEnd.parentNode;
+                                }
+
+                  this.editor.scrollToElement(holdEnd);
+                        }
+                catch (e) 
+                        {
+                        // we could try to place the cursor at the end of the document.
+                        }
+                }
+        
   this.editor.updateToolbar();
 
-  //======================
-    HTMLArea._stopEvent(ev);
-    return true;
-};
+        HTMLArea._stopEvent(ev);
+
+        return true;
+
+        };      // end of handleEnter()
+
+// END

branches/unified_backend/plugins/ImageManager/backend.php

@@ -41 +41 @@
 */
 
-include_once( "../ddt/ddt.php" );
+include_once( XINHA_INSTALL_ROOT . "/ddt/ddt.php" );
 
 // uncomment to turn on debugging

branches/unified_backend/plugins/ImageManager/config.inc.php

@@ -1 @@
-<?
+<?php
 /**
  * Image Manager configuration file.
@@ -292 +292 @@
 // bring in the debugging library.
 
-include_once( XINHA_INSTALL_ROOT . "/ddt/ddt.php" );
+if ( !function_exists( "_ddt" ) )
+        {
+        include_once( XINHA_INSTALL_ROOT . "/ddt/ddt.php" );
+        }
 
 // uncomment to send debug messages to a local file

branches/unified_backend/plugins/ImageManager/image-manager.js

@@ -99 +99 @@
 * then image will contain the selected image.
 *
-* @todo figure out how to get to editor object from Dialog function.
+* @todo check previousSibling issue. The fix here is probably covering up some other problem.
 */
 
@@ -116 +116 @@
 
                 if (image && !/^img$/i.test(image.tagName))
+                        {
+                        this.ddt._ddt( "image-manager.js","114", "_insertImage(): setting image to null" );
                         image = null;
+                        }
                 }
 
@@ -197 +200 @@
                                 }
 
+                        // pulled in as a result of the closure above.
+
                         var img = image;
 
@@ -204 +209 @@
                                 var range = editor._createRange(sel);                   
 
-                                ddt._ddt( "image-manager.js","206", "_insertImage(): execing insertImage" );
+                                // this is the browser built-in execCommand, not the HTMLArea execCommand
+                                // method. The assumption here is that it will interact with the range
+                                // created above so we can pull out the just inserted image from it.
+
+                                ddt._ddt( "image-manager.js","206", "_insertImage(): no image. invoking browser insertImage execCommand" );
 
                                 editor._doc.execCommand("insertimage", false, param.f_url);
@@ -221 +230 @@
                                 else 
                                         {
+
+                                        // If the editor window does not have focus or we are positioned immediately 
+                                        // adjacent to another image and do not have a selection this returns a null 
+                                        // object, not an img object. 
+                                        // 
+                                        // FIXME: The current Xinha commit, #156, does not exibit this behavior and it does
+                                        // not have the logic below. This implies there is some other problem elsewhere. 
+                                        // Why does it return null here under the same circumstances?
+
                                         img = range.startContainer.previousSibling;
+
+                                        if ( img == null ) 
+                                                {
+
+                                                // we are probably at the beginning or end of the document. By trial and 
+                                                // error it looks like the IMG tag is most likely our first child in the
+                                                // beginning of document case and under nextSibling in the end of document
+                                                // case. We'll need to verify this for future releases of Gecko.
+
+                                                ddt._ddt( "image-manager.js", "242", "_insertImage(): previousSibling is NULL. Checking firstChild" );
+
+                                                if (( range.startContainer.firstChild != null ) && ( range.startContainer.firstChild.nodeName == "IMG" ))
+                                                        {
+                                                        ddt._ddt( "image-manager.js", "251", "_insertImage(): Found image under firstChild. Beginning of document?" );
+
+                                                        img = range.startContainer.firstChild;
+                                                        }
+                                                else if (( range.startContainer.nextSibling != null ) && ( range.startContainer.nextSibling.nodeName == "IMG" ))
+                                                        {
+                                                        ddt._ddt( "image-manager.js", "242", "_insertImage(): Found image under nextSibling. end of document?" );
+                                                        img = range.startContainer.nextSibling;
+                                                        }
+                                                else
+                                                        {
+                                                        alert( "INTERNAL ERROR - was unable to locate the newly inserted image object. The HTML in the document may be out of whack." );
+                                                        return false
+                                                        }
+                                                }
                                         }
                                 } 
@@ -228 +274 @@
                                 img.src = param.f_url;
                                 }
-                
+
+                        ddt._ddt( "image-manager.js","234", "_insertImage(): before switch type of img is '" + typeof img + "'" );
+                                        
                         for (field in param) 
                                 {
@@ -235 +283 @@
                                 switch (field) 
                                         {
-                                   case "f_alt"    : img.alt     = value; break;
-                                   case "f_border" : img.border = parseInt(value || "0"); break;
-                                   case "f_align"  : img.align   = value; break;
-                                   case "f_vert"   : img.vspace = parseInt(value || "0"); break;
-                                   case "f_horiz"  : img.hspace = parseInt(value || "0"); break;
+                                        case "f_alt"    : img.alt        = value; break;
+                                        case "f_border" : img.border = parseInt(value || "0"); break;
+                                        case "f_align"  : img.align      = value; break;
+                                        case "f_vert"   : img.vspace = parseInt(value || "0"); break;
+                                        case "f_horiz"  : img.hspace = parseInt(value || "0"); break;
                                         case "f_width"  : img.width = parseInt(value || "0"); break;
                                         case "f_height"  : img.height = parseInt(value || "0"); break;

branches/unified_backend/plugins/ImageManager/images.php

@@ -1 @@
-<?
+<?php
+
 /**
  * Show a list of images in a long horizontal table.
@@ -8 +9 @@
 
 require_once('config.inc.php');
-require_once(XINHA_INSTALL_ROOT . '/ddt/ddt.php');
+
+// we may already have a definition of _ddt(). 
+
+if ( ! function_exists( "_ddt" ) )
+        {
+        require_once(XINHA_INSTALL_ROOT . '/ddt/ddt.php');
+        }
+
 require_once('Classes/ImageManager.php');
 
@@ -15 +23 @@
 // _ddtOn();
 
-//default path is /
+_ddt( __FILE__, __LINE__, "images.php - base_url is '" . $IMConfig['base_url'] . "'" );
+
+// default path is /
+
 $relative = '/';
 $manager = new ImageManager($IMConfig);
 
-//process any file uploads
+// process any file uploads
+
 $manager->processUploads();
 
@@ -25 +37 @@
 
 $refreshDir = false;
-//process any directory functions
+
+// process any directory functions
+
 if($manager->deleteDirs() || $manager->processNewDir())
         $refreshDir = true;
 
-//check for any sub-directory request
-//check that the requested sub-directory exists
-//and valid
-if(isset($_REQUEST['dir']))
-{
+// check for any sub-directory request
+// check that the requested sub-directory exists
+// and valid
+
+if (isset($_REQUEST['dir']))
+        {
         $path = rawurldecode($_REQUEST['dir']);
         if($manager->validRelativePath($path))
                 $relative = $path;
-}
+        }
 
 
 $manager = new ImageManager($IMConfig);
 
-//get the list of files and directories
+// get the list of files and directories
+
 $list = $manager->getFiles($relative);
 
@@ -50 +66 @@
  * Draw the files in an table.
  */
+
 function drawFiles($list, &$manager)
 {
         global $relative;
-        global $IMConfig;
+
+        // we used to have the global $IMConfig here but for some reason the global
+        // reference was getting dropped. Pulling it from inside manager is probably
+        // cleaner.
+
+        _ddt( __FILE__, __LINE__, "drawFiles(): config['base_url'] is '" . $manager->config['base_url'] . "'" );
 
         foreach($list as $entry => $file) 
@@ -66 +88 @@
                 <a href="javascript:;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);"title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"><img src="<?php print $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>"/></a>
                 </td></tr><tr><td class="edit">
-                        <a href="<?php echo $IMConfig['backend_url']; ?>__function=images&dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a><a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit"/></a>
+                        <a href="<?php print $IMConfig['backend_url']; ?>__function=images&dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php 
+                        
+                        _ddt( __FILE__, __LINE__, "images.php - base_url is '" . $manager->config['base_url'] . "'" );
+                        
+                        echo $manager->config['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a><a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $manager->config['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit"/></a>
                 <?php if($file['image']){ echo $file['image'][0].'x'.$file['image'][1]; } else echo $entry;?>
                 </td></tr></table></td> 
@@ -81 +107 @@
 {
         global $relative;
-   global $IMConfig;
 
         foreach($list as $path => $dir) 
         { ?>
                 <td><table width="100" cellpadding="0" cellspacing="0"><tr><td class="block">
-                <a href="<?php print $IMConfig['backend_url']; ?>__function=images&dir=<?php echo rawurlencode($path); ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $IMConfig['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
+                <a href="<?php print $manager->config['backend_url']; ?>__function=images&dir=<?php echo rawurlencode($path); ?>" onclick="updateDir('<?php echo $path; ?>')" title="<?php echo $dir['entry']; ?>"><img src="<?php print $manager->config['base_url'];?>img/folder.gif" height="80" width="80" alt="<?php echo $dir['entry']; ?>" /></a>
                 </td></tr><tr>
                 <td class="edit">
-                        <a href="<?php print $IMConfig['backend_url']; ?>__function=editor&dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a>
+                        <a href="<?php print $$manager->config['backend_url']; ?>__function=editor&dir=<?php echo $relative; ?>&amp;deld=<?php echo rawurlencode($path); ?>" title="Trash" onclick="return confirmDeleteDir('<?php echo $dir['entry']; ?>', <?php echo $dir['count']; ?>);"><img src="<?php 
+
+                        _ddt( __FILE__, __LINE__, "images.php - base_url is '" . $manager->config['base_url'] . "'" );
+                        
+                        print $manager->config['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash"/></a>
                         <?php echo $dir['entry']; ?>
                 </td>

branches/unified_backend/plugins/ImageManager/manager.php

@@ -1 @@
-<?
+<?php
 /**
 * The main GUI for the ImageManager.
@@ -8 +8 @@
 
 require_once('config.inc.php');
-require_once(XINHA_INSTALL_ROOT . '/ddt/ddt.php');
+
+if ( ! function_exists( "_ddt" ) )
+        {
+        require_once( XINHA_INSTALL_ROOT . '/ddt/ddt.php');
+        }
+
 require_once('Classes/ImageManager.php');
         

branches/unified_backend/plugins/Linker/linker.js

@@ -572 +572 @@
             {
 
-                        linker.ddt._ddt( "linker.js","574", "_prepareDialog(): backend defined. loading files using _getback()" );
+                        linker.ddt._ddt( "linker.js","574", "_prepareDialog(): backend defined. loading files using _getback() from '" + linker.lConfig.backend + "__function=scan'" );
 
                         //get files from backend
@@ -579 +579 @@
                                                         {
 
-                                                        linker.ddt._ddt( "linker.js","581",  "linker.js", "_getback(): got back txt '" + txt + "'"  );
+                                                        // for some reason this linker reference is not working in this closure
+                                                        // under firefox 1.0.3.
+
+                                                        linker.ddt._ddt( "linker.js","581", "_getback(): got back txt '" + txt + "'"  );
 
                                                         try 
@@ -629 +632 @@
 
   var html = this.html;
+
+        linker.ddt._ddt( "linker.js","634", "_prepareDialog(): to dialog html '" + html + "'" );
 
   // Now we have everything we need, so we can build the dialog.

branches/unified_backend/plugins/Linker/scan.php

@@ -278 +278 @@
 // get the output in an error popup.
 //
-// _ddtOn();
-
-_ddt( __FILE__, __LINE__, "scan.php: Resulting array is '" + $javascript_array + "'" );
+
+_setDebugLog( "/tmp/debug_log.txt" );
+
+_ddtOn();
+
+_ddt( __FILE__, __LINE__, "scan.php: hello\n" );
+
+_ddt( __FILE__, __LINE__, "scan.php: Resulting array is '" . $javascript_array . "'" );
 
 echo $javascript_array;

branches/unified_backend/popups/about.html

@@ -17 +17 @@
 this file will match the version of the repository.
 
-[@@82@@]
+[@@83@@]
 
 -->