Changeset 190 for trunk

Timestamp:

05/23/05 15:12:55 (15 years ago)

Author:

gogo

Message:

Copy EP from unified_backend @ revision 172
Commented yermo's debugging

File:

• trunk/plugins/EnterParagraphs/enter-paragraphs.js (copied) (copied from branches/unified_backend/plugins/EnterParagraphs/enter-paragraphs.js) (58 diffs)

trunk/plugins/EnterParagraphs/enter-paragraphs.js

@@ -15 +15 @@
 */
 
-EnterParagraphs._pluginInfo = 
+EnterParagraphs._pluginInfo =
         {
   name          : "EnterParagraphs",
@@ -85 +85 @@
 */
 
-function EnterParagraphs(editor) 
+function EnterParagraphs(editor)
         {
 
@@ -91 +91 @@
 
         // [STRIP
-        // create a ddt debug trace object. There may be multiple editors on 
+        // 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" );
+        //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" );
+
+        //this.ddt._ddtOn();
+
+        //this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): constructor" );
 
         // STRIP]
@@ -110 +110 @@
   if (HTMLArea.is_gecko)
                 {
-                this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): we are gecko. Setting event handler." );
+                //this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): we are gecko. Setting event handler." );
     this.onKeyPress = this.__onKeyPress;
                 }
@@ -131 +131 @@
 */
 
-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' ) 
+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' ) 
+  else if ( pos == 'AfterEnd' )
                 {
                 ref.nextSibling ? ref.parentNode.insertBefore(el,ref.nextSibling) : ref.parentNode.appendChild(el);
                 }
-  else if ( pos == 'AfterBegin' && ref.firstChild ) 
+  else if ( pos == 'AfterBegin' && ref.firstChild )
                 {
                 ref.insertBefore(el,ref.firstChild);
                 }
-  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' ) 
+  else if ( pos == 'BeforeEnd' || pos == 'AfterBegin' )
                 {
                 ref.appendChild(el);
                 }
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): bottom with ref:", ref );
+        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "122", "insertAdjacentElement(): bottom with ref:", ref );
 
         };      // end of insertAdjacentElement()
@@ -169 +169 @@
 */
 
-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 );
+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;
 
-        // nodeType 11 is DOCUMENT_FRAGMENT_NODE which is a container. 
-
-  if ( root.nodeType == 11 && root.firstChild ) 
+        // nodeType 11 is DOCUMENT_FRAGMENT_NODE which is a container.
+
+  if ( root.nodeType == 11 && root.firstChild )
                 {
     start = root.firstChild;
     end = root.lastChild;
-          } 
-        else 
+          }
+        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 );
+        //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 ) 
+  while ( end.lastChild )
                 end = end.lastChild;
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): end node after descent is:", end );
+        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "144", "forEachNodeUnder(): end node after descent is:", end );
 
   return this.forEachNode( start, end, mode, direction, init);
@@ -216 +216 @@
 */
 
-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 );
+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 getSibling = function(elem, direction)
+                                                        {
+                                                        return ( direction == "ltr" ? elem.nextSibling : elem.previousSibling );
                                                         };
 
-  var getChild = function(elem, direction) 
-                                                        { 
-                                                        return ( direction == "ltr" ? elem.firstChild : elem.lastChild ); 
+  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 
+        // FIXME: init is a boolean in the emptyset case and an object in
         // the cullids case. Used inconsistently.
-                
+
         var next_node = init;
 
@@ -249 +249 @@
         // 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 
+  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 ) 
+    if ( !walk )
                         {
                         walk = direction == "ltr" ? left_node : right_node;
 
-                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): !walk - current node is:", walk );
-                        }
-    else 
+                        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): !walk - current node is:", walk );
+                        }
+    else
                         {
 
                         // is there a child node?
 
-      if ( getChild(walk,direction) ) 
+      if ( getChild(walk,direction) )
                                 {
 
@@ -273 +273 @@
                                 walk = getChild(walk,direction);
 
-                                this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode():descending to child node:", walk );
+                                //this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode():descending to child node:", walk );
 
                                 }
-      else 
+      else
                                 {
 
                                 // is there a sibling node on this level?
 
-        if ( getSibling(walk,direction) ) 
+        if ( getSibling(walk,direction) )
                                         {
 
@@ -288 +288 @@
                                         walk = getSibling(walk,direction);
 
-                                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): moving to sibling node:", walk );
+                                        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): moving to sibling node:", walk );
 
                                         }
-        else 
+        else
                                         {
           lookup = walk;
 
-                                        // climb back up the tree until we find a level where we are not the end 
+                                        // 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) ) 
+          while ( !getSibling(lookup,direction) && lookup != (direction == "ltr" ? right_node : left_node) )
                                                 {
                                                 lookup = lookup.parentNode;
                                                 }
 
-                                        // did we find a level with a sibling? 
+                                        // did we find a level with a sibling?
 
           // walk = ( lookup.nextSibling ? lookup.nextSibling : lookup ) ;
@@ -310 +310 @@
           walk = ( getSibling(lookup,direction) ? getSibling(lookup,direction) : lookup ) ;
 
-                                        this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): climbed back up (or found right node):", walk );
-                                        
-                            }   
-                                }       
+                                        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "175", "forEachNode(): climbed back up (or found right node):", walk );
+
+                            }
+                                }
 
                         }       // end of else walk.
@@ -323 +323 @@
 
                 // call the requested function on the current node. Functions
-                // return an array. 
+                // return an array.
                 //
                 // Possible functions are _fenCullIds, _fenEmptySet
@@ -332 +332 @@
                 // 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" );
+                //this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): calling function" );
 
                 switch( mode )
@@ -339 +339 @@
                         case "cullids":
 
-                fnReturnVal = this._fenCullIds(walk, next_node );       
+                fnReturnVal = this._fenCullIds(walk, next_node );
                                 break;
 
                         case "find_fill":
 
-                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);      
+                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
                                 break;
 
                         case "find_cursorpoint":
 
-                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);      
+                fnReturnVal = this._fenEmptySet(walk, next_node, mode, done_flag);
                                 break;
 
@@ -356 +356 @@
                 // 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 ( 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 )
@@ -372 +372 @@
                 // Otherwise, pass to the next node
 
-    if ( fnReturnVal[1] ) 
-                        {
-                        next_node = fnReturnVal[1];                                                             
+    if ( fnReturnVal[1] )
+                        {
+                        next_node = fnReturnVal[1];
                         }
 
           }     // end of while loop
 
-        this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): returning false." );
+        //this.ddt._ddt( "enter-paragraphs.js", "175", "forEachNode(): returning false." );
 
   return false;
@@ -393 +393 @@
 * @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 );
+* @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 ( !next_node && !node.firstChild ) 
+  if ( !next_node && !node.firstChild )
                 {
                 next_node = node;
@@ -414 +414 @@
   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 );
+    (node.nodeType != 1 && node.nodeType != 3) )
+                {
+
+                //this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : found content in node:", node );
 
                 switch( mode )
@@ -430 +430 @@
 
                         case "find_cursorpoint":
-                                
+
                                 // returns content
 
@@ -445 +445 @@
   if ( last_flag )
                 {
-                this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : return 'base' node:", next_node );
+                //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 );
+        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "263", "_fenEmptySet() : bottom returning false and :", next_node );
 
   return new Array( false, next_node );
@@ -459 +459 @@
 
 /**
-* remove duplicate Id's. 
+* 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" );
+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 ) 
-                {
-
-                this.ddt._ddt( "enter-paragraphs.js", "299", "_fenCullIds(): node '" + node.nodeName + "' has an id '" + node.id + "'" );
+  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;
@@ -489 +489 @@
 *
 * @param rng Range
-* @param search_direction string "left" or "right" 
+* @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 ); 
+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 );
                                                         };
 
@@ -508 +508 @@
   var roam, start = node;
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "337", "processSide(): starting with node:", 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) ) 
+  while ( start.nodeType == 1 && !this._permEmpty.test(start.nodeName) )
                 {
                 start = ( offset ? start.lastChild : start.firstChild );
@@ -532 +532 @@
                 {
 
-                this.ddt._ddtDumpNode( "enter-paragraphs.js", "357", "processSide(): roaming loop, search_direction is '" + search_direction + "' current node is: ", roam );
+                //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 ( 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,search_direction).nodeName) ) 
+      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." );
+                                //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." );
+                    }
+                        }
+                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)) 
+      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." );
+                                //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)) 
+      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." );
+                                //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)) 
+        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." );
+                                        //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 
+                }
+                                else
                                         {
 
-                                        this.ddt._ddt( "enter-paragraphs.js", "371", "processSide(): Parent Node '" + roam.parentNode.nodeName + "' is not on the _pBreak list." );
+                                        //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
@@ -592 +592 @@
                                         // because it's already wrapped.
 
-          return this.processRng(rng, 
-                                                                                                                                search_direction, 
+          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, 
+                                                                                      (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" );
+                                        }
+                                }
+                        }
+                }
+
+        //this.ddt._ddt( "enter-paragraphs.js", "424", "processSide(): bottom" );
 
         };      // end of processSide()
@@ -618 +618 @@
 * @param rn Range original selected range
 * @param search_direction string Direction to search in.
-* @param roam node 
+* @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 + "'" );
+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 );
+        //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
@@ -643 +643 @@
   newRng.selectNode(roam);
 
-        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 );
+        //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.
@@ -653 +653 @@
     rng.setStart(newRng.startContainer, newRng.startOffset);
 
-                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 );
-
-          } 
+                //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" )
                 {
@@ -663 +663 @@
                 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._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 );
+        //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
@@ -673 +673 @@
   var cnt = newRng.cloneContents();
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "509", "processRng(): culling duplicate ids from:", cnt );
+        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "509", "processRng(): culling duplicate ids from:", cnt );
 
         // in this case "init" is an object not a boolen.
@@ -679 +679 @@
   this.forEachNodeUnder( cnt, "cullids", "ltr", this.takenIds, false, false);
 
-  // Special case, for inserting paragraphs before some blocks when caret is at 
-        // their zero offset. 
+  // 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
@@ -690 +690 @@
   pify = pify ? newRng.startContainer : newRng.endContainer;
 
-        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) ) 
+        //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;
@@ -702 +702 @@
         // NODE TYPE 11 is DOCUMENT_FRAGMENT NODE
 
-  if ( cnt.nodeType == 11 && !cnt.firstChild ) 
+  if ( cnt.nodeType == 11 && !cnt.firstChild )
                 {
                 cnt.appendChild(editor._doc.createElement(pify.nodeName));
@@ -710 +710 @@
         // error in forEachNode()
 
-        this.ddt._ddt( "enter-paragraphs.js", "612", "processRng(): find_fill in cnt." );
+        //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.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" );
+                ( (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' );
@@ -733 +733 @@
                 // after the list etc.
 
-    if ((search_direction == "left" ) && pify.previousSibling) 
-                        {
-
-                        this.ddt._ddt( "enter-paragraphs.js", "682", "processRng(): returning created roam AfterEnd" );
+    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" );
+    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 + "'" );
+    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);
@@ -759 +759 @@
   // If our cloned contents are 'content'-less, shove a break in them
 
-  if ( fill ) 
-                {
-
-                // Ill-concieved? 
+  if ( fill )
+                {
+
+                // Ill-concieved?
                 //
                 // 3 is a TEXT node and it should be empty.
-                // 
-
-                if ( fill.nodeType == 3 ) 
-                        {
-                        // fill = fill.parentNode;              
+                //
+
+                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 
+                        //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.
 
@@ -788 +788 @@
 
                         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." );
+
+                        //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);
@@ -809 +809 @@
         // 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 
+        // <p>test</p><p></p> because Gecko was finding two empty text nodes
         // when traversing on the right hand side of an empty document.
 
@@ -815 +815 @@
                 {
 
-                this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): no content. Using fill.", fill );
+                //this.ddt._ddtDumpNode( "enter-paragraphs.js", "606", "processRng(): no content. Using fill.", fill );
 
                 roam = fill;
@@ -823 +823 @@
           // 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 + "' " );
-        
+                //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" );
+  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 );
+        //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
@@ -852 +852 @@
 * 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 
+* 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.
 */
@@ -864 +864 @@
         {
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "863", "isNormaListItem(): checking rng for list end:", rng );
+        //this.ddt._ddtDumpNode( "enter-paragraphs.js", "863", "isNormaListItem(): checking rng for list end:", rng );
 
         var node, listNode;
@@ -874 +874 @@
                 {
 
-                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): node is a list item");
+                //this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): node is a list item");
 
                 // are we a list item?
@@ -885 +885 @@
                 {
 
-                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): parent is a list item");
-                        
+                //this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): parent is a list item");
+
                 // our parent is a list item.
 
@@ -894 +894 @@
         else
                 {
-                this.ddt._ddt( "enter-paragraphs.js", "863", "isNormaListItem(): not list item");
+                //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
@@ -902 +902 @@
                 }
 
-        // at this point we have a listNode. Is it the first list item? 
+        // 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? 
+                //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." );
+                        //this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): we are on the first character." );
 
                         return false;
@@ -918 +918 @@
                 }
 
-        this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): this is a normal list item case." );
+        //this.ddt._ddt( "enter-paragraphs.js", "839", "isNormaListItem(): this is a normal list item case." );
         return true;
 
@@ -924 +924 @@
 
 // ----------------------------------------------------------------------------------
-/**                                                      
+/**
 * 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 + "'" );
+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
@@ -937 +937 @@
   if (ev.keyCode == 13 && !ev.shiftKey && this.editor._iframe.contentWindow.getSelection)
                 {
-                this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): calling handleEnter" );
+                //this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): calling handleEnter" );
 
     return this.handleEnter(ev);
                 }
 
-        this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): bottom" );
+        //this.ddt._ddt( "enter-paragraphs.js", "517", "__onKeyPress(): bottom" );
 
         };      // end of _onKeyPress()
@@ -952 +952 @@
 */
 
-EnterParagraphs.prototype.handleEnter = function(ev) 
-        {
-
-        this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): top" );
+EnterParagraphs.prototype.handleEnter = function(ev)
+        {
+
+        //this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): top" );
 
         var cursorNode;
@@ -964 +964 @@
   var rng = this.editor._createRange(sel);
 
-        this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): initial range is: ", rng );
+        //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
@@ -971 +971 @@
         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." );
+                //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. 
+        // as far as I can tell this isn't actually used.
 
   this.takenIds = new Object();
@@ -986 +986 @@
         // [2] roam
 
-        this.ddt._ddt( "enter-paragraphs.js", "537", "handleEnter(): calling processSide on left side." );
+        //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." );
+        //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");
@@ -1009 +1009 @@
         // we'll use this to position the cursor.
 
-        this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looking for cursor position" );
+        //this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looking for cursor position" );
 
   var holdEnd = this.forEachNodeUnder( cursorNode, "find_cursorpoint", "ltr", false, true);
@@ -1020 +1020 @@
   // Insert our carefully chosen document fragments
 
-  if ( pStart ) 
-                {
-
-                this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
+  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" );
+  if ( pEnd && pEnd.nodeType != 1)
+                {
+
+                //this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): inserting pEnd" );
 
                 this.insertAdjacentElement(pEnd[0], pEnd[1], pEnd[2]);
@@ -1038 +1038 @@
   // Move the caret in front of the first good text element
 
-  if ((holdEnd) && (this._permEmpty.test(holdEnd.nodeName) )) 
-                {
-
-                this.ddt._ddt( "enter-paragraphs.js", "712", "handleEnter(): looping to find cursor element." );
+  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 ) 
+    while ( holdEnd.parentNode.childNodes.item(prodigal) != holdEnd )
                         {
                         prodigal++;
@@ -1051 +1051 @@
     sel.collapse( holdEnd.parentNode, prodigal);
           }
-  else 
+  else
                 {
 
                 // holdEnd might be false.
 
-                try 
+                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. 
-                        
+                        //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 )
                                 {
@@ -1071 +1071 @@
                   this.editor.scrollToElement(holdEnd);
                         }
-                catch (e) 
+                catch (e)
                         {
                         // we could try to place the cursor at the end of the document.
                         }
                 }
-        
+
   this.editor.updateToolbar();