Changeset 193

Timestamp:

05/24/05 21:30:03 (8 years ago)

Author:

gogo

Message:

Various small fixes and refactoring. A couple of new utility functions
and a fix for #6

Files:

• trunk/htmlarea.js (modified) (20 diffs)

trunk/htmlarea.js

@@ -1293 +1293 @@
   this._framework.ed_cell.appendChild(iframe);
   this._iframe = iframe;
+  this._iframe.className = 'xinha_iframe';
 
     // creates & appends the status bar
@@ -1301 +1302 @@
   var textarea = this._textArea;
   textarea.parentNode.insertBefore(htmlarea, textarea);
+  textarea.className = 'xinha_textarea';
 
   // extract the textarea and insert it into the htmlarea
-  textarea.parentNode.removeChild(textarea);
+  HTMLArea.removeFromParent(textarea);
   this._framework.ed_cell.appendChild(textarea);
 
@@ -1515 +1517 @@
     var col_span = 1;
 
-    if(panels.left.on && panels.left.panels.length && HTMLArea.hasDisplayedChildren(panels.left.container))
+    function panel_is_alive(pan)
+    {
+      if(panels[pan].on && panels[pan].panels.length && HTMLArea.hasDisplayedChildren(panels[pan].container))
+      {
+        return true;
+      }
+
+      // Otherwise make sure it's been removed from the framework
+      else
+      {
+        HTMLArea.removeFromParent(panels[pan].container);
+        return false;
+      }
+    }
+
+    if(panel_is_alive('left'))
     {
       col_span += 1;
-      if(!panels.left.container.parentNode)
+      if(!HTMLArea.hasParentNode(panels.left.container))
       {
         this._framework.ler_row.insertBefore(panels.left.container,this._framework.ed_cell);
       }
     }
-    else
-    {
-      if(panels.left.container.parentNode)
-      {
-        panels.left.container.parentNode.removeChild(panels.left.container);
-      }
-    }
-
-    if(panels.top.on && panels.top.panels.length && HTMLArea.hasDisplayedChildren(panels.top.container))
-    {
-      if(!panels.top.container.parentNode)
+
+    if(panel_is_alive('top'))
+    {
+      if(!HTMLArea.hasParentNode(panels.top.container))
       {
         this._framework.tp_row.appendChild(panels.top.container);
       }
     }
-    else
-    {
-      if(panels.top.container.parentNode)
-      {
-        panels.top.container.parentNode.removeChild(panels.top.container);
-      }
-    }
-
-    if(panels.right.on && panels.right.panels.length && HTMLArea.hasDisplayedChildren(panels.right.container))
+
+    if(panel_is_alive('right'))
     {
       col_span += 1;
-      if(!panels.right.container.parentNode)
+      if(!HTMLArea.hasParentNode(panels.right.container))
       {
         this._framework.ler_row.insertBefore(panels.right.container, this._framework.ed_cell.nextSibling);
       }
     }
-    else
-    {
-      if(panels.right.container.parentNode)
-      {
-        panels.right.container.parentNode.removeChild(panels.right.container);
-      }
-    }
-
-    if(panels.bottom.on && panels.bottom.panels.length && HTMLArea.hasDisplayedChildren(panels.bottom.container))
-    {
-      if(!panels.bottom.container.parentNode)
-      {
-        this._framework.bp_row.appendChild(panels.right.container);
-      }
-    }
-    else
-    {
-      if(panels.bottom.container.parentNode)
-      {
-        panels.bottom.container.parentNode.removeChild(panels.bottom.container);
+
+    if(panel_is_alive('bottom'))
+    {
+      if(!HTMLArea.hasParentNode(panels.bottom.container))
+      {
+        this._framework.bp_row.appendChild(panels.bottom.container);
       }
     }
@@ -1585 +1574 @@
     if(!this._framework.tp_row.childNodes.length)
     {
-      if(this._framework.tp_row.parentNode)
-      {
-        this._framework.tp_row.parentNode.removeChild(this._framework.tp_row);
-      }
+      HTMLArea.removeFromParent(this._framework.tp_row);
     }
     else
     {
-      if(!this._framework.tp_row.parentNode)
+      if(!HTMLArea.hasParentNode(this._framework.tp_row))
       {
         this._framework.tbody.insertBefore(this._framework.tp_row, this._framework.ler_row);
@@ -1601 +1587 @@
     if(!this._framework.bp_row.childNodes.length)
     {
-      if(this._framework.bp_row.parentNode)
-      {
-        this._framework.bp_row.parentNode.removeChild(this._framework.bp_row);
-      }
+      HTMLArea.removeFromParent(this._framework.bp_row);
     }
     else
     {
-      if(!this._framework.bp_row.parentNode)
+      if(!HTMLArea.hasParentNode(this._framework.bp_row))
       {
         this._framework.tbody.insertBefore(this._framework.bp_row, this._framework.ler_row.nextSibling);
@@ -1615 +1598 @@
 
     // finally if the statusbar is on, insert it
-    if(this.config.statusBar)
-    {
-      if(!this._framework.sb_row.parentNode)
+    if(!this.config.statusBar)
+    {
+      HTMLArea.removeFromParent(this._framework.sb_row);
+    }
+    else
+    {
+      if(!HTMLArea.hasParentNode(this._framework.sb_row))
       {
         this._framework.table.appendChild(this._framework.sb_row);
-      }
-    }
-    else
-    {
-      if(this._framework.sb_row.parentNode)
-      {
-        this._framework.sb_row.parentNode.removeChild(this._framework.sb_row);
       }
     }
@@ -1893 +1873 @@
            + ".htmtableborders, .htmtableborders td, .htmtableborders th {border : 1px dashed lightgrey ! important;} \n"
            + "</style>\n";
-      html += "<style>"
-           + editor.config.pageStyle + "\n"
+      html += "<style type=\"text/css\">"
            + "html, body { border: 0px; } \n"
            + "span.macro, span.macro ul, span.macro div, span.macro p {background : #CCCCCC;}\n"
            + "</style>\n";
+
+      if(editor.config.pageStyle)
+      {
+        html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>";
+      }
+
       if(typeof editor.config.pageStyleSheets !== 'undefined')
       {
@@ -2303 +2288 @@
       var txt = document.createTextNode(HTMLArea.getInnerText(el));
       el.parentNode.insertBefore(txt, el);
-      el.parentNode.removeChild(el);
+      HTMLArea.removeFromParent(el);
     }
     ++stats.mso_xmlel;
@@ -2310 +2295 @@
     if (/^(a|span|b|strong|i|em|font)$/i.test(el.tagName) &&
         !el.firstChild) {
-      el.parentNode.removeChild(el);
+      HTMLArea.removeFromParent(el);
       ++stats.empty_tags;
     }
@@ -2737 +2722 @@
       plugin.onUpdateToolbar();
   }
+
 
 }
@@ -3147 +3133 @@
   this.forceRedraw();
   var range;
-  var collapsed = (typeof pos != "undefined");
+  var collapsed = typeof pos == "undefined" ? true : false;
   if (HTMLArea.is_ie) {
     // Tables and Images get selected as "objects" rather than the text contents
-    if(!collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img/))
+    if(collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|select|textarea/))
     {
       range = this._doc.body.createControlRange();
@@ -3166 +3152 @@
     range = this._doc.createRange();
     // Tables and Images get selected as "objects" rather than the text contents
-    if(!collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img/))
+    if(collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|textarea|select/))
     {
       range.selectNode(node);
-      (collapsed) && range.collapse(pos);
     }
     else
@@ -3629 +3614 @@
         if(typeof tag == 'string') tag = editor._doc.createElement(tag);
         var a = textNode.parentNode.insertBefore(tag, rightText);
-        textNode.parentNode.removeChild(textNode);
+        HTMLArea.removeFromParent(textNode);
         a.appendChild(textNode);
         rightText.data = ' ' + rightText.data;
@@ -3650 +3635 @@
           a.removeChild(t);
           a.parentNode.insertBefore(t, a);
-          a.parentNode.removeChild(a);
+          HTMLArea.removeFromParent(a);
           editor._unLink = null;
           editor._unlinkOnUndo = false;
@@ -3804 +3789 @@
   {
     var elm = this._activeElement(sel);
-    elm.parentNode.removeChild(elm);
+    HTMLArea.removeFromParent(elm);
     return true;
   }
@@ -3844 +3829 @@
         p.appendChild(SC.firstChild);
       SC.parentNode.insertBefore(p, SC);
-      SC.parentNode.removeChild(SC);
+      HTMLArea.removeFromParent(SC);
       var r = range.cloneRange();
       r.setStartBefore(newr);
@@ -4685 +4670 @@
       for (i = 0; i < attrs.length; ++i) {
         var a = attrs.item(i);
-        if (!a.specified) {
+        if (!a.specified && !(root.tagName.toLowerCase().match(/input|option/) && a.nodeName == 'value')) {
           continue;
         }
@@ -5005 +4990 @@
         alert('An error has occurred: ' + req.statusText);
       }
-      req.onreadystatechange = null;
     }
   }
@@ -5045 +5029 @@
         alert('An error has occurred: ' + req.statusText);
       }
-      req.onreadystatechange = null;
     }
   }
@@ -5314 +5297 @@
 }
 
+/** Utility function to base64_encode some arbitrary data, uses the builtin btoa() if it exists (Moz) */
+
+HTMLArea.base64_encode =  function(input)
+{
+  var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+  var output = "";
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+
+  do {
+    chr1 = input.charCodeAt(i++);
+    chr2 = input.charCodeAt(i++);
+    chr3 = input.charCodeAt(i++);
+
+    enc1 = chr1 >> 2;
+    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+    enc4 = chr3 & 63;
+
+    if (isNaN(chr2)) {
+       enc3 = enc4 = 64;
+    } else if (isNaN(chr3)) {
+       enc4 = 64;
+    }
+
+    output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) +
+       keyStr.charAt(enc3) + keyStr.charAt(enc4);
+  } while (i < input.length);
+
+  return output;
+}
+
+/** Utility function to base64_decode some arbitrary data, uses the builtin atob() if it exists (Moz) */
+
+HTMLArea.base64_decode =function(input)
+{
+  var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+  var output = "";
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+
+  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+  do {
+    enc1 = keyStr.indexOf(input.charAt(i++));
+    enc2 = keyStr.indexOf(input.charAt(i++));
+    enc3 = keyStr.indexOf(input.charAt(i++));
+    enc4 = keyStr.indexOf(input.charAt(i++));
+
+    chr1 = (enc1 << 2) | (enc2 >> 4);
+    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+    chr3 = ((enc3 & 3) << 6) | enc4;
+
+    output = output + String.fromCharCode(chr1);
+
+    if (enc3 != 64) {
+       output = output + String.fromCharCode(chr2);
+    }
+    if (enc4 != 64) {
+       output = output + String.fromCharCode(chr3);
+    }
+  } while (i < input.length);
+
+  return output;
+}
+
+HTMLArea.removeFromParent = function(el)
+{
+  if(!el.parentNode) return;
+  var pN = el.parentNode;
+  pN.removeChild(el);
+  return el;
+}
+
+HTMLArea.hasParentNode = function(el)
+{
+  if(el.parentNode)
+  {
+    // When you remove an element from the parent in IE it makes the parent
+    // of the element a document fragment.  Moz doesn't.
+    if(el.parentNode.nodeType == 11)
+    {
+      return false;
+    }
+    return true;
+  }
+
+  return false;
+}
+
+HTMLArea.getOuterHTML = function(element)
+{
+  if(HTMLArea.is_ie)
+  {
+    return element.outerHTML;
+  }
+  else
+  {
+    return (new XMLSerializer()).serializeToString(element);
+  }
+}
+
+
 HTMLArea.init();