Changeset 863

Timestamp:

07/10/07 18:08:12 (6 years ago)

Author:

ray

Message:

• Ticket #1019 Cusor not jumping to editable part of window when clicked in IE7
  
• Ticket #1046 Error in IE 6 when switching from text to wysiwyg
  
• DOMwalk: linebreaks inserted before <br />s
  

Location:

trunk

Files:

• XinhaCore.js (modified) (3 diffs)
• modules/GetHtml/DOMwalk.js (modified) (2 diffs)

trunk/XinhaCore.js

@@ -2847 +2847 @@
   {
     this._doc.body.contentEditable = true;
-
-    if (this._iframe.contentWindow.event.srcElement.tagName.toLowerCase() == 'html') // if  clicked below the text (=body), the text cursor does not appear, see #1019 
-    {
-      var r = this._doc.body.createTextRange();
-      setTimeout (function () { r.collapse();  r.select();},100); // won't do without timeout, dunno why
-    }
   }
 
@@ -3141 +3135 @@
 {
   var editor=this;
-  var doc = (Xinha.is_ie) ? this._doc.getElementsByTagName("html")[0] : this._doc; // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039
+  var doc = this._doc;
 
   editor.whenDocReady(
@@ -3156 +3150 @@
         }
       );
+      if (Xinha.is_ie)
+      { // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039
+        Xinha._addEvent(
+        editor._doc.getElementsByTagName("html")[0],
+        "click",
+          function()
+          {
+            if (editor._iframe.contentWindow.event.srcElement.tagName.toLowerCase() == 'html') // if  clicked below the text (=body), the text cursor does not appear, see #1019
+            {
+               var r = editor._doc.body.createTextRange();
+               r.collapse();  
+               r.select()
+               //setTimeout (function () { r.collapse();  r.select();},100); // won't do without timeout, dunno why
+             }
+             return true;
+          }
+        );
+      }
 
       // intercept some events; for updating the toolbar & keyboard handlers

trunk/modules/GetHtml/DOMwalk.js

@@ -53 +53 @@
 
 Xinha.emptyAttributes = " checked disabled ismap readonly nowrap compact declare selected defer multiple noresize noshade ";
-Xinha.elGetsNewLine = function (el) { return (" br meta link title ".indexOf(" " + el.tagName.toLowerCase() + " ") != -1);};
+Xinha.elGetsNewLine = function (el) { return (" br hr  meta link title ".indexOf(" " + el.tagName.toLowerCase() + " ") != -1);};
 
 Xinha.getHTMLWrapper = function(root, outputRoot, editor, indent)
@@ -304 +304 @@
       else
       {
-        html = Xinha.htmlEncode(root.data);
+        html = Xinha.htmlEncode(root.data.trim());
       }
     break;