Ticket #1997: 1997_2.patch

_whatsnew.html

@@ -112 +112 @@
                         as expected.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1998">#1998</a>] The native
                         XMLHttpRequest class is now used in IE, whenever it is available.</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>
                 Version 2.6 Beta 1</h3>

editor/_source/classes/fckdomrange.js

@@ -149 +149 @@
         // is "<p><b><i>^</i></b> Text</p>" (inside <i>).
         MoveToElementEditStart : function( targetElement )
         {
-                var child ;
+                var editableElement ;
 
-                while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
-                        targetElement = child ;
+                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.
 
-                this.MoveToElementStart( targetElement ) ;
+                        targetElement = targetElement.firstChild ;
+                }
+
+                if ( editableElement )
+                        this.MoveToElementStart( editableElement ) ;
         },
 
         InsertNode : function( node )

editor/_source/internals/fck.js

@@ -669 +669 @@
                         range.SplitBlock() ;
                         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.
                         if ( !next && FCKConfig.EnterMode != 'br')

editor/_source/internals/fckdomtools.js

@@ -1005 +1005 @@
                 var currentScroll = FCKTools.GetScrollPosition( window ).Y ;
                 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 ] ) ;
         }
 } ;

editor/_source/internals/fcklistslib.js

@@ -54 +54 @@
         // Object elements for the Styles System.
         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 },
         ListBoundaries  : { 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,br:1 }

editor/dtd/fck_dtd_test.html

@@ -17 +17 @@
         <table border="1">
                 <script type="text/javascript">
 
-    alert(FCK.DTD);
-
 for ( var p in FCK.DTD )
 {
         document.write( '<tr><td><b>' + p + '</b></td><td>' ) ;

editor/fckdialog.html

@@ -681 +681 @@
 
         window.Cancel = function( dontFireChange )
         {
+                Selection.EnsureSelection() ;
                 return CloseDialog( dontFireChange ) ;
         } ;
 
@@ -688 +689 @@
         {
                 Throbber.Hide() ;
 
-                Selection.EnsureSelection() ;
-
                 // Points the src to a non-existent location to avoid loading errors later, in case the dialog
                 // haven't been completed loaded at this point.
                 if ( $( 'frmMain' ) )