Changeset 12 for trunk

Timestamp:

02/15/05 03:54:50 (15 years ago)

Author:

gogo

Message:

Change the method of inserting a space in strategic locations.
See ticket:9

Location:

trunk

Files:

• examples/core.html (modified) (1 diff)
• htmlarea.js (modified) (3 diffs)

trunk/examples/core.html

@@ -13 +13 @@
 </script>
 <script type="text/javascript" src="../htmlarea.js"></script>
-<script type="text/javascript" src="../htmlarea_css.js"></script>
 
 <style type="text/css">

trunk/htmlarea.js

@@ -2147 +2147 @@
   // Insert a space in certain locations, this is just to make editing a little
   // easier (to "get out of" tags), it's not essential.
+  // TODO: Make this work for IE?
+  // TODO: Perhaps should use a plain space character, I'm not sure.
   if(HTMLArea.is_gecko)
   {
     var s = this._getSelection();
-    if(s && s.isCollapsed && s.anchorNode && s.anchorNode.nodeType == 3)
-    {
-      if(s.anchorOffset == s.anchorNode.length)
-      {
-        if(HTMLArea.isBlockElement(s.anchorNode.parentNode))
-        {
-          if(s.anchorNode.data != '\xA0' && !s.anchorNode.nextSibling)
-          {
-            s.anchorNode.parentNode.insertBefore(this._doc.createTextNode('\xA0'), s.anchorNode.nextSibling);
-          }
-        }
-        else
-        {
-          if(!s.anchorNode.parentNode.nextSibling)
-          {
-            s.anchorNode.parentNode.parentNode.insertBefore(this._doc.createTextNode('\xA0'), s.anchorNode.parentNode.nextSibling);
-          }
-        }
+    // If the last character in the last text node of the parent tag
+    if(s && s.isCollapsed && s.anchorNode
+         && s.anchorNode.parentNode.tagName.toLowerCase() != 'body'
+         && s.anchorNode.nodeType == 3 && s.anchorOffset == s.anchorNode.length
+         && !
+          (   s.anchorNode.parentNode.nextSibling
+           && s.anchorNode.parentNode.nextSibling.nodeType == 3
+          )
+      )
+    {
+      // Insert hair-width-space after the close tag if there isn't another text node on the other side
+      // It could also work with zero-width-space (\u200B) but I don't like it so much.
+      // Perhaps this won't work well in various character sets and we should use plain space (20)?
+      try
+      {
+        s.anchorNode.parentNode.parentNode.insertBefore
+          (this._doc.createTextNode('\u200A'), s.anchorNode.parentNode.nextSibling);
+      }
+      catch(e)
+      {
+        // Disregard
       }
     }
@@ -2179 +2184 @@
   }
 
-};
+}
 
 /** Returns a node after which we can insert other nodes, in the current
@@ -2968 +2973 @@
     catch(e) { if (this.config.debug) { alert(e + "\n\nby execCommand(" + cmdID + ");"); } }
   }
+
   this.updateToolbar();
   return false;