<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >\r
<!--\r
* FCKeditor - The text editor for Internet - http://www.fckeditor.net\r
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben\r
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben\r
*\r
* == BEGIN LICENSE ==\r
*\r
<script src="common/fck_dialog_common.js" type="text/javascript"></script>\r
<script type="text/javascript">\r
\r
-var oEditor = window.parent.InnerDialogLoaded() ;\r
+var dialog = window.parent ;\r
+var oEditor = dialog.InnerDialogLoaded() ;\r
\r
-// Gets the document DOM\r
-var oDOM = oEditor.FCK.EditorDocument ;\r
+var FCKDomTools = oEditor.FCKDomTools ;\r
\r
// Gets the table if there is one selected.\r
var table ;\r
-var e = oEditor.FCKSelection.GetSelectedElement() ;\r
+var e = dialog.Selection.GetSelectedElement() ;\r
+var hasColumnHeaders ;\r
\r
if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )\r
e = oEditor.FCKSelection.MoveToAncestorNode( 'TABLE' ) ;\r
document.getElementById('txtSummary').value = GetAttribute( table, 'summary', '' ) ;\r
// document.getElementById('cmbFontStyle').value = table.className ;\r
\r
- if (table.caption) document.getElementById('txtCaption').value = table.caption.innerHTML ;\r
+ var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;\r
+ if ( eCaption ) document.getElementById('txtCaption').value = eCaption.innerHTML ;\r
+\r
+ hasColumnHeaders = true ;\r
+ // Check if all the first cells in every row are TH\r
+ for (var row=0; row<table.rows.length; row++)\r
+ {\r
+ // If just one cell isn't a TH then it isn't a header column\r
+ if ( table.rows[row].cells[0].nodeName != 'TH' )\r
+ {\r
+ hasColumnHeaders = false ;\r
+\r
+ break;\r
+ }\r
+ }\r
+\r
+ // Check if the table contains <thead>\r
+ if ((table.tHead !== null) )\r
+ {\r
+ if (hasColumnHeaders)\r
+ GetE('selHeaders').value = 'both' ;\r
+ else\r
+ GetE('selHeaders').value = 'row' ;\r
+ }\r
+ else\r
+ {\r
+ if (hasColumnHeaders)\r
+ GetE('selHeaders').value = 'col' ;\r
+ else\r
+ GetE('selHeaders').value = '' ;\r
+ }\r
+\r
\r
document.getElementById('txtRows').disabled = true ;\r
document.getElementById('txtColumns').disabled = true ;\r
+ SelectField( 'txtWidth' ) ;\r
}\r
+ else\r
+ SelectField( 'txtRows' ) ;\r
\r
- window.parent.SetOkButton( true ) ;\r
- window.parent.SetAutoSize( true ) ;\r
+ dialog.SetOkButton( true ) ;\r
+ dialog.SetAutoSize( true ) ;\r
}\r
\r
// Fired when the user press the OK button\r
{\r
var bExists = ( table != null ) ;\r
\r
+ var oDoc = oEditor.FCK.EditorDocument ;\r
+ oEditor.FCKUndo.SaveUndoStep() ;\r
+\r
if ( ! bExists )\r
- table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;\r
+ table = oDoc.createElement( "TABLE" ) ;\r
\r
// Removes the Width and Height styles\r
if ( bExists && table.style.width ) table.style.width = null ; //.removeAttribute("width") ;\r
SetAttribute( table, 'cellSpacing' , GetE('txtCellSpacing').value ) ;\r
SetAttribute( table, 'summary' , GetE('txtSummary').value ) ;\r
\r
- var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;\r
-\r
- if ( document.getElementById('txtCaption').value != '')\r
+ var headers = GetE('selHeaders').value ;\r
+ if ( bExists )\r
{\r
- if ( !eCaption )\r
+ // Should we make a <thead>?\r
+ if ( table.tHead==null && (headers=='row' || headers=='both') )\r
{\r
- eCaption = oEditor.FCK.EditorDocument.createElement( 'CAPTION' ) ;\r
- table.insertBefore( eCaption, table.firstChild ) ;\r
+ var oThead = table.createTHead() ;\r
+ var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;\r
+ var theRow= FCKDomTools.GetFirstChild( tbody, 'TR' ) ;\r
+\r
+ //now change TD to TH:\r
+ for (var i = 0; i<theRow.childNodes.length ; i++)\r
+ {\r
+ var th = RenameNode(theRow.childNodes[i], 'TH') ;\r
+ if (th != null)\r
+ th.scope='col' ;\r
+ }\r
+ oThead.appendChild( theRow ) ;\r
}\r
\r
- eCaption.innerHTML = document.getElementById('txtCaption').value ;\r
- }\r
- else if ( bExists && eCaption )\r
- {\r
- if ( oEditor.FCKBrowserInfo.IsIE )\r
- eCaption.innerHTML = '' ; // TODO: It causes an IE internal error if using removeChild or table.deleteCaption().\r
- else\r
- eCaption.parentNode.removeChild( eCaption ) ;\r
+ if ( table.tHead!==null && !(headers=='row' || headers=='both') )\r
+ {\r
+ // Move the row out of the THead and put it in the TBody:\r
+ var tHead = table.tHead ;\r
+ var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;\r
+\r
+ var previousFirstRow = tbody.firstChild ;\r
+ while ( tHead.firstChild )\r
+ {\r
+ var theRow = tHead.firstChild ;\r
+ for (var i = 0; i < theRow.childNodes.length ; i++ )\r
+ {\r
+ var newCell = RenameNode( theRow.childNodes[i], 'TD' ) ;\r
+ if ( newCell != null )\r
+ newCell.removeAttribute( 'scope' ) ;\r
+ }\r
+ tbody.insertBefore( theRow, previousFirstRow ) ;\r
+ }\r
+ table.removeChild( tHead ) ;\r
+ }\r
+\r
+ // Should we make all first cells in a row TH?\r
+ if ( (!hasColumnHeaders) && (headers=='col' || headers=='both') )\r
+ {\r
+ for( var row=0 ; row < table.rows.length ; row++ )\r
+ {\r
+ var newCell = RenameNode(table.rows[row].cells[0], 'TH') ;\r
+ if ( newCell != null )\r
+ newCell.scope = 'row' ;\r
+ }\r
+ }\r
+\r
+ // Should we make all first TH-cells in a row make TD? If 'yes' we do it the other way round :-)\r
+ if ( (hasColumnHeaders) && !(headers=='col' || headers=='both') )\r
+ {\r
+ for( var row=0 ; row < table.rows.length ; row++ )\r
+ {\r
+ var oRow = table.rows[row] ;\r
+ if ( oRow.parentNode.nodeName == 'TBODY' )\r
+ {\r
+ var newCell = RenameNode(oRow.cells[0], 'TD') ;\r
+ if (newCell != null)\r
+ newCell.removeAttribute( 'scope' ) ;\r
+ }\r
+ }\r
+ }\r
}\r
\r
if (! bExists)\r
{\r
- var iRows = document.getElementById('txtRows').value ;\r
- var iCols = document.getElementById('txtColumns').value ;\r
+ var iRows = GetE('txtRows').value ;\r
+ var iCols = GetE('txtColumns').value ;\r
\r
- for ( var r = 0 ; r < iRows ; r++ )\r
+ var startRow = 0 ;\r
+ // Should we make a <thead> ?\r
+ if (headers=='row' || headers=='both')\r
{\r
+ startRow++ ;\r
+ var oThead = table.createTHead() ;\r
var oRow = table.insertRow(-1) ;\r
+ oThead.appendChild(oRow);\r
+\r
for ( var c = 0 ; c < iCols ; c++ )\r
{\r
- var oCell = oRow.insertCell(-1) ;\r
+ var oThcell = oDoc.createElement( 'TH' ) ;\r
+ oThcell.scope = 'col' ;\r
+ oRow.appendChild( oThcell ) ;\r
if ( oEditor.FCKBrowserInfo.IsGeckoLike )\r
- oCell.innerHTML = GECKO_BOGUS ;\r
- //oCell.innerHTML = " " ;\r
+ oEditor.FCKTools.AppendBogusBr( oThcell ) ;\r
}\r
}\r
\r
- oEditor.FCKUndo.SaveUndoStep() ;\r
+ // Opera automatically creates a tbody when a thead has been added\r
+ var oTbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ;\r
+ if ( !oTbody )\r
+ {\r
+ // make TBODY if it doesn't exist\r
+ oTbody = oDoc.createElement( 'TBODY' ) ;\r
+ table.appendChild( oTbody ) ;\r
+ }\r
+ for ( var r = startRow ; r < iRows; r++ )\r
+ {\r
+ var oRow = oDoc.createElement( 'TR' ) ;\r
+ oTbody.appendChild(oRow) ;\r
+\r
+ var startCol = 0 ;\r
+ // Is the first column a header?\r
+ if (headers=='col' || headers=='both')\r
+ {\r
+ var oThcell = oDoc.createElement( 'TH' ) ;\r
+ oThcell.scope = 'row' ;\r
+ oRow.appendChild( oThcell ) ;\r
+ if ( oEditor.FCKBrowserInfo.IsGeckoLike )\r
+ oEditor.FCKTools.AppendBogusBr( oThcell ) ;\r
+\r
+ startCol++ ;\r
+ }\r
+ for ( var c = startCol ; c < iCols ; c++ )\r
+ {\r
+ // IE will leave the TH at the end of the row if we use now oRow.insertCell(-1)\r
+ var oCell = oDoc.createElement( 'TD' ) ;\r
+ oRow.appendChild( oCell ) ;\r
+ if ( oEditor.FCKBrowserInfo.IsGeckoLike )\r
+ oEditor.FCKTools.AppendBogusBr( oCell ) ;\r
+ }\r
+ }\r
\r
oEditor.FCK.InsertElement( table ) ;\r
}\r
\r
+ var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;\r
+\r
+ if ( eCaption && !oEditor.FCKBrowserInfo.IsIE )\r
+ eCaption.parentNode.removeChild( eCaption ) ;\r
+\r
+ if ( document.getElementById('txtCaption').value != '' )\r
+ {\r
+ if ( !eCaption || !oEditor.FCKBrowserInfo.IsIE )\r
+ {\r
+ eCaption = oDoc.createElement( 'CAPTION' ) ;\r
+ table.insertBefore( eCaption, table.firstChild ) ;\r
+ }\r
+\r
+ eCaption.innerHTML = document.getElementById('txtCaption').value ;\r
+ }\r
+ else if ( bExists && eCaption )\r
+ {\r
+ // TODO: It causes an IE internal error if using removeChild or\r
+ // table.deleteCaption() (see #505).\r
+ if ( oEditor.FCKBrowserInfo.IsIE )\r
+ eCaption.innerHTML = '' ;\r
+ }\r
+\r
return true ;\r
}\r
\r
<table cellspacing="1" cellpadding="1" width="100%" border="0">\r
<tr>\r
<td valign="top">\r
- <table cellspacing="0" cellpadding="0" border="0">\r
+ <table cellspacing="1" cellpadding="0" border="0">\r
<tr>\r
<td>\r
<span fcklang="DlgTableRows">Rows</span>:</td>\r
<td>\r
- <input id="txtRows" type="text" maxlength="3" size="2" value="3" name="txtRows"\r
+ <input id="txtRows" type="text" maxlength="3" size="2" value="3"\r
onkeypress="return IsDigit(event);" /></td>\r
</tr>\r
<tr>\r
<td>\r
<span fcklang="DlgTableColumns">Columns</span>:</td>\r
<td>\r
- <input id="txtColumns" type="text" maxlength="2" size="2" value="2" name="txtColumns"\r
+ <input id="txtColumns" type="text" maxlength="2" size="2" value="2"\r
onkeypress="return IsDigit(event);" /></td>\r
</tr>\r
<tr>\r
+ <td><span fcklang="DlgTableHeaders">Headers</span>:</td>\r
<td>\r
- </td>\r
- <td>\r
- </td>\r
+ <select id="selHeaders">\r
+ <option fcklang="DlgTableHeadersNone" value="">None</option>\r
+ <option fcklang="DlgTableHeadersRow" value="row">First row</option>\r
+ <option fcklang="DlgTableHeadersColumn" value="col">First column</option>\r
+ <option fcklang="DlgTableHeadersBoth" value="both">Both</option>\r
+ </select>\r
+ </td>\r
</tr>\r
<tr>\r
<td>\r
<span fcklang="DlgTableBorder">Border size</span>:</td>\r
<td>\r
- <input id="txtBorder" type="text" maxlength="2" size="2" value="1" name="txtBorder"\r
+ <input id="txtBorder" type="text" maxlength="2" size="2" value="1"\r
onkeypress="return IsDigit(event);" /></td>\r
</tr>\r
<tr>\r
<td>\r
<span fcklang="DlgTableAlign">Alignment</span>:</td>\r
<td>\r
- <select id="selAlignment" name="selAlignment">\r
+ <select id="selAlignment">\r
<option fcklang="DlgTableAlignNotSet" value="" selected="selected"><Not set></option>\r
<option fcklang="DlgTableAlignLeft" value="left">Left</option>\r
<option fcklang="DlgTableAlignCenter" value="center">Center</option>\r
<td>\r
<span fcklang="DlgTableWidth">Width</span>:</td>\r
<td>\r
- <input id="txtWidth" type="text" maxlength="4" size="3" value="200" name="txtWidth"\r
+ <input id="txtWidth" type="text" maxlength="4" size="3" value="200"\r
onkeypress="return IsDigit(event);" /></td>\r
<td>\r
- <select id="selWidthType" name="selWidthType">\r
+ <select id="selWidthType">\r
<option fcklang="DlgTableWidthPx" value="pixels" selected="selected">pixels</option>\r
<option fcklang="DlgTableWidthPc" value="percent">percent</option>\r
</select></td>\r
<td>\r
<span fcklang="DlgTableHeight">Height</span>:</td>\r
<td>\r
- <input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" /></td>\r
+ <input id="txtHeight" type="text" maxlength="4" size="3" onkeypress="return IsDigit(event);" /></td>\r
<td>\r
<span fcklang="DlgTableWidthPx">pixels</span></td>\r
</tr>\r
<tr>\r
- <td>\r
- </td>\r
- <td>\r
- </td>\r
- <td>\r
- </td>\r
+ <td colspan="3"> </td>\r
</tr>\r
<tr>\r
<td nowrap="nowrap">\r
<span fcklang="DlgTableCellSpace">Cell spacing</span>:</td>\r
<td>\r
- <input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1" name="txtCellSpacing"\r
+ <input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1"\r
onkeypress="return IsDigit(event);" /></td>\r
<td>\r
</td>\r
<td nowrap="nowrap">\r
<span fcklang="DlgTableCellPad">Cell padding</span>:</td>\r
<td>\r
- <input id="txtCellPadding" type="text" maxlength="2" size="2" value="1" name="txtCellPadding"\r
+ <input id="txtCellPadding" type="text" maxlength="2" size="2" value="1"\r
onkeypress="return IsDigit(event);" /></td>\r
<td>\r
</td>\r
projects / freeside.git / blobdiff