Changeset 1803

Timestamp:

2008-03-26 08:48:46 (2 years ago)

Author:

fredck

Message:

Fixed #1997 : With IE, the first character of table captions where being lost on table creation. Also, the selection and cursor position was not being properly handled when creating some elements like forms and tables.

Location:

FCKeditor/trunk

Files:

• editor/dtd/fck_dtd_test.html (modified) (1 diff)
• editor/fckdialog.html (modified) (2 diffs)
• editor/_source/classes/fckdomrange.js (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fcklistslib.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dtd/fck_dtd_test.html

@@ -17 +17 @@
         <table border="1">
                 <script type="text/javascript">
-
-    alert(FCK.DTD);
 
 for ( var p in FCK.DTD )

FCKeditor/trunk/editor/fckdialog.html

@@ -673 +673 @@
         window.Cancel = function( dontFireChange )
         {
+                Selection.EnsureSelection() ;
                 return CloseDialog( dontFireChange ) ;
         } ;
@@ -679 +680 @@
         {
                 Throbber.Hide() ;
-
-                Selection.EnsureSelection() ;
 
                 // Points the src to a non-existent location to avoid loading errors later, in case the dialog

FCKeditor/trunk/editor/_source/classes/fckdomrange.js

@@ -150 +150 @@
         MoveToElementEditStart : function( targetElement )
         {
-                var child ;
-
-                while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
-                        targetElement = child ;
-
-                this.MoveToElementStart( targetElement ) ;
+                var editableElement ;
+
+                while ( targetElement && targetElement.nodeType == 1 )
+                {
+                        if ( FCKDomTools.CheckIsEditable( targetElement ) )
+                                editableElement = targetElement ;
+                        else if ( editableElement )
+                                break ;         // If we already found an editable element, stop the loop.
+
+                        targetElement = targetElement.firstChild ;
+                }
+
+                if ( editableElement )
+                        this.MoveToElementStart( editableElement ) ;
         },
 

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

@@ -1006 +1006 @@
                 if ( offset > 0 && offset > currentScroll )
                         window.scrollTo( 0, offset ) ;
+        },
+
+        /**
+         * Check if the element can be edited inside the browser.
+         */
+        CheckIsEditable : function( element )
+        {
+                // Get the element name.
+                var nodeName = element.nodeName.toLowerCase() ;
+
+                // Get the element DTD (defaults to span for unknown elements).
+                var childDTD = FCK.DTD[ nodeName ] || FCK.DTD.span ;
+
+                // In the DTD # == text node.
+                return ( childDTD['#'] && !FCKListsLib.NonEditableElements[ nodeName ] ) ;
         }
 } ;

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

@@ -672 +672 @@
                         range.InsertNode( element ) ;
 
-                        var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ] ) ;
+                        var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ], true ) ;
 
                         // Be sure that we have something after the new element, so we can move the cursor there.

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

@@ -55 +55 @@
         StyleObjectElements : { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },
 
+        // Elements that accept text nodes, but are not possible to edit in the browser.
+        NonEditableElements : { button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },
+
         // Elements used to separate block contents.
         BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },

FCKeditor/trunk/_whatsnew.html

@@ -139 +139 @@
                         dialogs using API calls which deals with the selection, like InsertHtml now can
                         be sure the selection will be placed in the correct position.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1997">#1997</a>] With
+                        IE, the first character of table captions where being lost on table creation.</li>
+                <li>The selection and cursor position was not being properly handled when creating some
+                        elements like forms and tables.</li>
         </ul>
         <h3>