Changeset 2139

Timestamp:

2008-06-25 12:22:15 (7 months ago)

Author:

martinkou

Message:

Fixed #2263 : Fixed a JavaScript error in IE which occurs when there are placeholder elements in the document and the user has pressed the Source button.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_anchor.html (modified) (2 diffs)
• editor/_source/internals/fck.js (modified) (4 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dialog/fck_anchor.html

@@ -122 +122 @@
         {
                 // Nothing was selected, so now just create a normal A
-                aNewAnchors.push( oEditor.FCK.InsertElement( 'a' ) ) ;
+                if ( FCKBrowserInfo.IsIE )
+                        aNewAnchors.push( oEditor.FCK.InsertElement( '<a name="' + FCKTools.HTMLEncode( sNewName ).replace( '"', '&quot;' ) + '">' ) ) ;
+                else
+                {
+                        var n ;
+                        aNewAnchors.push( ( n = oEditor.FCK.InsertElement( 'a' ), n.name = sNewName, n ) ) ;
+                }
         }
         else
@@ -135 +141 @@
         {
                 oAnchor = aNewAnchors[i] ;
-
-                // Set the name
-                oAnchor.name = sNewName ;
 
                 // IE does require special processing to show the Anchor's image

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -632 +632 @@
                 var sHtml ;
 
-                // Update the HTML in the view output to show.
+                // Update the HTML in the view output to show, also update
+                // FCKTempBin for IE to avoid #2263.
                 if ( bIsWysiwyg )
                 {
@@ -640 +641 @@
 
                         sHtml = FCK.GetXHTML( FCKConfig.FormatSource ) ;
+
+                        if ( FCKBrowserInfo.IsIE )
+                                FCKTempBin.ToHtml() ;
 
                         if ( sHtml == null )
@@ -938 +942 @@
         FCK.EditorDocument      = FCK.EditingArea.Document ;
 
+        if ( FCKBrowserInfo.IsIE )
+                FCKTempBin.ToElements() ;
+
         FCK.InitializeBehaviors() ;
 
@@ -1090 +1097 @@
                         this.Elements[ i++ ] = null ;
                 this.Elements.length = 0 ;
+        },
+
+        ToHtml : function()
+        {
+                for ( var i = 0 ; i < this.Elements.length ; i++ )
+                        this.Elements[i] = this.Elements[i].outerHTML ;
+        },
+
+        ToElements : function()
+        {
+                var node = FCK.EditorDocument.createElement( 'div' ) ;
+                for ( var i = 0 ; i < this.Elements.length ; i++ )
+                {
+                        if ( typeof( this.Elements[i] ) == 'string' )
+                        {
+                                node.innerHTML = this.Elements[i] ;
+                                this.Elements[i] = node.firstChild ;
+                        }
+                }
         }
 } ;

FCKeditor/trunk/_whatsnew.html

@@ -50 +50 @@
                         editor/css/fck_editorarea.css on how to handle style items that would break the style combo.
                         </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2263">#2263</a>] Fixed a JavaScript
+                        error in IE which occurs when there are placeholder elements in the document and the user
+                        has pressed the Source button.</li>
         </ul>
         <p>