Ticket #2430: 2430.patch

editor/_source/internals/fckdomtools.js

@@ -1053 +1053 @@
                 }
 
                 return currentBlocks ;
+        }, 
+
+        // Replaces a tag with another one, keeping its contents:
+        // for example TD --> TH, and TH --> TD.
+        // input: the original node, and the new tag name
+        // http://www.w3.org/TR/DOM-Level-3-Core/core.html#Document3-renameNode
+        RenameNode : function( oNode , newTag )
+        {
+                // TODO: if the browser natively supports document.renameNode call it.
+                // does any browser currently support it in order to test?
+
+                // Only rename element nodes.
+                if ( oNode.nodeType != 1 ) 
+                        return null ;
+
+                // If it's already correct exit here.
+                if ( oNode.nodeName == newTag )
+                        return oNode ;
+
+                var oDoc = oNode.ownerDocument ;
+                // Create the new node
+                var newNode = oDoc.createElement( newTag ) ;
+
+                // Copy all attributes
+                var at = oNode.attributes ;
+                for( var i=0 ; i < at.length ; i++ )
+                {
+                        if ( at[i] && at[i].nodeValue != "" && at[i].nodeValue != null )
+                                newNode.setAttribute( at[i].nodeName, at[i].nodeValue ) ;
+                }
+
+                // Move children to the new node
+                while( oNode.firstChild )
+                        newNode.appendChild( oNode.firstChild ) ;
+
+                // Finally replace the node and return the new one
+                oNode.parentNode.replaceChild( newNode, oNode ) ;
+
+                return newNode ;
         }
+
 } ;

editor/dialog/fck_table.html

@@ -35 +35 @@
 
 // Gets the document DOM
 var oDOM = oEditor.FCK.EditorDocument ;
+var FCKDomTools = oEditor.FCKDomTools ;
 
 // Gets the table if there is one selected.
 var table ;
@@ -87 +88 @@
 
                 var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;
                 if ( eCaption ) document.getElementById('txtCaption').value = eCaption.innerHTML ;
+                
+                // Check if the table contains <thead>
+                if (table.tHead)
+                        GetE('chkThead').checked = true ;
 
+                // Check if all the first cells in every row are TH
+                GetE('HeaderCol').value = 1 ;
+                GetE('chkFirstColTh').checked = true ;
+                for (var row=0; row<table.rows.length; row++)
+                {
+                        // If just one cell isn't a TH then it isn't a header column
+                        if ( table.rows[row].cells[0].nodeName != 'TH' )
+                        {
+                                GetE('chkFirstColTh').checked = false ;
+                                GetE('HeaderCol').value = 0 ;
+                                
+                                break;
+                        }
+                }
+
                 document.getElementById('txtRows').disabled    = true ;
                 document.getElementById('txtColumns').disabled = true ;
                 SelectField( 'txtWidth' ) ;
@@ -104 +124 @@
 {
         var bExists = ( table != null ) ;
 
+        var oDoc = oEditor.FCK.EditorDocument ; 
         if ( ! bExists )
-                table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;
+                table = oDoc.createElement( "TABLE" ) ;
 
         // Removes the Width and Height styles
         if ( bExists && table.style.width )             table.style.width = null ; //.removeAttribute("width") ;
@@ -129 +150 @@
         {
                 if ( !eCaption )
                 {
-                        eCaption = oEditor.FCK.EditorDocument.createElement( 'CAPTION' ) ;
+                        eCaption = oDoc.createElement( 'CAPTION' ) ;
                         table.insertBefore( eCaption, table.firstChild ) ;
                 }
 
@@ -145 +166 @@
                         eCaption.parentNode.removeChild( eCaption ) ;
         }
 
+        if ( bExists )
+        {
+                // Should we make a <thead>?
+                if ( table.tHead==null && GetE('chkThead').checked )
+                {
+                        var oThead = table.createTHead() ;
+                        var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;
+                        var theRow= FCKDomTools.GetFirstChild( tbody, 'TR' ) ;
+
+                        //now change TD to TH:
+                        for (var i = 0; i<theRow.childNodes.length ; i++) 
+                        {
+                                var th = FCKDomTools.RenameNode(theRow.childNodes[i], 'TH') ;
+                                if (th != null) 
+                                        th.scope='col' ;
+                        }
+                        oThead.appendChild( theRow ) ;
+                }
+
+                if ( table.tHead!=null && !GetE('chkThead').checked )
+                {
+                        // Move the row out of the THead and put it in the TBody:
+                        var tHead = table.tHead ;
+                        var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;
+
+                        var previousFirstRow = tbody.firstChild ;
+                        while ( tHead.firstChild ) 
+                        {
+                                var theRow = tHead.firstChild ;
+                                for (var i = 0; i < theRow.childNodes.length ; i++ ) 
+                                {
+                                        var newCell = FCKDomTools.RenameNode( theRow.childNodes[i], 'TD' ) ;
+                                        if ( newCell != null ) 
+                                                newCell.removeAttribute( 'scope' ) ;
+                                }
+                                tbody.insertBefore( theRow, previousFirstRow ) ;
+                        }
+                        table.removeChild( tHead ) ;
+                }
+
+                // Should we make all first cells in a row TH?
+                if ( (GetE('HeaderCol').value == 0)  && GetE('chkFirstColTh').checked )
+                {
+                        for( var row=0 ; row < table.rows.length ; row++ )
+                        {
+                                var newCell = FCKDomTools.RenameNode(table.rows[row].cells[0], 'TH') ;
+                                if ( newCell != null ) 
+                                        newCell.scope = 'col' ;
+                        }
+                }
+
+                // Should we make all first TH-cells in a row make TD? If 'yes' we do it the other way round :-)
+                if ( (GetE('HeaderCol').value == 1)  && !GetE('chkFirstColTh').checked )
+                {
+                        for( var row=0 ; row < table.rows.length ; row++ )
+                        {
+                                var newCell = FCKDomTools.RenameNode(table.rows[row].cells[0], 'TD') ;
+                                if (newCell != null) 
+                                        newCell.removeAttribute( 'scope' ) ;
+                        }
+                }
+        }
+
         if (! bExists)
         {
-                var iRows = document.getElementById('txtRows').value ;
-                var iCols = document.getElementById('txtColumns').value ;
+                var iRows = GetE('txtRows').value ;
+                var iCols = GetE('txtColumns').value ;
 
-                for ( var r = 0 ; r < iRows ; r++ )
+                var startRow = 0 ;
+                // Should we make a <thead> ?
+                if (GetE('chkThead').checked) 
                 {
+                        startRow++ ;
+                        var oThead = table.createTHead() ;
                         var oRow = table.insertRow(-1) ;
+                        oThead.appendChild(oRow);
+                        
                         for ( var c = 0 ; c < iCols ; c++ )
                         {
+                                var oThcell = oDoc.createElement( 'TH' ) ; 
+                                oThcell.scope = 'col' ;
+                                oRow.appendChild( oThcell ) ;
+                                if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+                                        oEditor.FCKTools.AppendBogusBr( oThcell ) ;
+                        }
+                }
+
+                var oTbody = oDoc.createElement( 'TBODY' ) ; // make TBODY
+                table.appendChild( oTbody ) ;
+
+                for ( var r = startRow ; r < iRows; r++ ) 
+                {
+                        var oRow = oDoc.createElement( 'TR' ) ;
+                        oTbody.appendChild(oRow) ;
+
+                        var startCol = 0 ;
+                        // Is the first column a header?
+                        if (GetE('chkFirstColTh').checked)
+                        {
+                                var oThcell = oDoc.createElement( 'TH' ) ;
+                                oThcell.scope = 'row' ;
+                                oRow.appendChild( oThcell ) ;
+                                if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+                                        oEditor.FCKTools.AppendBogusBr( oThcell ) ;
+
+                                startCol++ ;
+                        }
+                        for ( var c = startCol ; c < iCols ; c++ )
+                        {
                                 var oCell = oRow.insertCell(-1) ;
                                 if ( oEditor.FCKBrowserInfo.IsGeckoLike )
                                         oEditor.FCKTools.AppendBogusBr( oCell ) ;
                         }
                 }
-
                 oEditor.FCKUndo.SaveUndoStep() ;
 
                 oEditor.FCK.InsertElement( table ) ;
@@ -194 +313 @@
                                                                                         onkeypress="return IsDigit(event);" /></td>
                                                                 </tr>
                                                                 <tr>
-                                                                        <td>
-                                                                                &nbsp;</td>
-                                                                        <td>
-                                                                                &nbsp;</td>
+                                                                        <td><span fckLang="DlgThead">Table Header</span>:</td>
+                                                                        <td><input id="chkThead" type="checkbox"></td>
                                                                 </tr>
                                                                 <tr>
+                                                                        <td><span fckLang="DlgFirstColTh">First column header</span>:</td>
+                                                                        <td><input id="chkFirstColTh" type="checkbox"><input type="hidden" id="HeaderCol" value="0" /></td>
+                                                                </tr>
+                                                                <tr>
                                                                         <td>
                                                                                 <span fcklang="DlgTableBorder">Border size</span>:</td>
                                                                         <td>
@@ -244 +365 @@
                                                                                 &nbsp;<span fcklang="DlgTableWidthPx">pixels</span></td>
                                                                 </tr>
                                                                 <tr>
-                                                                        <td>
-                                                                                &nbsp;</td>
-                                                                        <td>
-                                                                                &nbsp;</td>
-                                                                        <td>
-                                                                                &nbsp;</td>
+                                                                        <td>&nbsp;</td>
+                                                                        <td>&nbsp;</td>
+                                                                        <td>&nbsp;</td>
                                                                 </tr>
                                                                 <tr>
+                                                                        <td>&nbsp;</td>
+                                                                        <td>&nbsp;</td>
+                                                                        <td>&nbsp;</td>
+                                                                </tr>
+                                                                <tr>
                                                                         <td nowrap="nowrap">
                                                                                 <span fcklang="DlgTableCellSpace">Cell spacing</span>:</td>
                                                                         <td>