Changeset 1069

Timestamp:

10/06/08 16:10:47 (2 months ago)

Author:

douglas

Message:

CHANGED Ticket #1290 For my last fix I was testing against a cached copy. This fixes bug in the last checkin.

Files:

• trunk/XinhaCore.js (modified) (5 diffs)

trunk/XinhaCore.js

@@ -732 +732 @@
    *  @type Boolean
    */
-  this.killWordOnPaste = true;
+  this.killWordOnPaste = false;
 
   /** Enable the 'Target' field in the Make Link dialog. Note that the target attribute is invalid in (X)HTML strict<br />
@@ -3718 +3718 @@
   }
 
-  var stripTag = null;
-  if ( Xinha.is_ie )
-  {
-    stripTag = function(el)
-    {
-      el.outerHTML = Xinha.htmlEncode(el.innerText);
-      ++stats.mso_xmlel;
-    };
-  }
-  else
-  {
-    stripTag = function(el)
-    {
-      var txt = document.createTextNode(Xinha.getInnerText(el));
-      el.parentNode.insertBefore(txt, el);
-      Xinha.removeFromParent(el);
-      ++stats.mso_xmlel;
-    };
-  }
-
   function removeElements(el)
   {
@@ -3766 +3746 @@
   function parseTree(root)
   {
-    var tag = root.tagName.toLowerCase(), i, next;
-
     clearClass(root);
     clearStyle(root);
@@ -3773 +3751 @@
     for (var i = root.firstChild; i; i = next )
     {
-      next = i.nextSibling;
+      var next = i.nextSibling;
       if ( i.nodeType == 1 && parseTree(i) )
       {
-        if ((Xinha.is_ie && root.scopeName != 'HTML') || (!Xinha.is_ie && /:/.test(tag)))
+        if ((Xinha.is_ie && root.scopeName != 'HTML') || (!Xinha.is_ie && /:/.test(i.tagName)))
         {
           // Nowadays, Word spits out tags like '<o:something />'.  Since the
@@ -3785 +3763 @@
           // parents of elements that should be their siblings.  We reparent
           // the children and remove them from the document.
-          for (var index=i.children && ichildren.length-1; i.children && i.children.length && i.children[index]; ++index)
+          for (var index=i.childNodes && i.childNodes.length-1; i.childNodes && i.childNodes.length && i.childNodes[index]; --index)
           {
             if (i.nextSibling)
             {
-              i.parentNode.insertBefore(i.children[index],i.nextSibling);
+              i.parentNode.insertBefore(i.childNodes[index],i.nextSibling);
             }
             else
             {
-              i.parentNode.appendChild(i.children[index]);
+              i.parentNode.appendChild(i.childNodes[index]);
             }
-            Xinha.removeFromParent(i);
           }
+          Xinha.removeFromParent(i);
+          continue;
         }
         if (checkEmpty(i))