Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/fck.afpa.code =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/fck.afpa.code (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/fck.afpa.code (revision 131) @@ -4,6 +4,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -15,12 +15,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/sample01.afp =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/sample01.afp (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/sample01.afp (revision 131) @@ -5,6 +5,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -16,12 +16,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/sample02.afp =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/sample02.afp (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/sample02.afp (revision 131) @@ -5,6 +5,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -16,12 +16,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/sample03.afp =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/sample03.afp (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/sample03.afp (revision 131) @@ -5,6 +5,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -16,12 +16,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/sample04.afp =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/sample04.afp (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/sample04.afp (revision 131) @@ -5,6 +5,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -16,12 +16,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_samples/afp/sampleposteddata.afp =================================================================== --- /FCKeditor/branches/versions/2.4.x/_samples/afp/sampleposteddata.afp (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_samples/afp/sampleposteddata.afp (revision 131) @@ -5,6 +5,6 @@ * == BEGIN LICENSE == * - * Licensed under the terms of any, but only one, of the following - * licenses at your choice: + * Licensed under the terms of any of the following licenses at your + * choice: * * - GNU General Public License Version 2 or later (the "GPL") @@ -16,12 +16,4 @@ * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * - * If you wish to allow use of your version of this file under the terms - * of exclusively one of the GPL, the LGPL or the MPL, indicate your - * decision by deleting this license provisions and replace them with the - * notice and other provisions required by the GPL, the LGPL or the MPL. - * If you do not delete this license provisions, a recipient may use your - * version of this file under the terms of any one of the GPL, the LGPL - * or the MPL. * * == END LICENSE == Index: /FCKeditor/branches/versions/2.4.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.4.x/_whatsnew.html (revision 130) +++ /FCKeditor/branches/versions/2.4.x/_whatsnew.html (revision 131) @@ -18,8 +18,4 @@ New Features and Improvements:

* This version has been partially sponsored by Medical Media Lab.

+

+ Version 2.3.3

+

+ New Features and Improvements:

+

Version 2.3.2

Index: /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckdomrange.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckdomrange.js (revision 131) @@ -64,5 +64,5 @@ CheckIsCollapsed : function() { - if ( this._Range ) + if ( this._Range ) return this._Range.collapsed ; }, @@ -140,5 +140,5 @@ }, - CheckEndOfBlock : function() + CheckEndOfBlock : function( refreshSelection ) { // Create a clone of the current range. @@ -154,4 +154,7 @@ oTestRange.Release() ; + + if ( refreshSelection ) + this.Select() ; return bIsEndOfBlock ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckelementpath.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckelementpath.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckelementpath.js (revision 131) @@ -24,12 +24,11 @@ this.LastElement = e ; - var sElementName = e.nodeName.toUpperCase() ; + var sElementName = e.nodeName.toLowerCase() ; - // TODO: Review the Regex and move it to the RegexLib. - if ( !eBlockLimit && !eBlock && (/^(?:P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DT|DE)$/).test( sElementName ) ) + if ( !eBlockLimit && !eBlock && FCKListsLib.PathBlockElements[ sElementName ] != null ) eBlock = e ; // TODO: Review the Regex and move it to the RegexLib. - if ( !eBlockLimit && (/^(?:BODY|TD|TH|CAPTION|FORM)$/).test( sElementName ) ) + if ( !eBlockLimit && (/^(?:body|td|th|caption|form)$/).test( sElementName ) ) eBlockLimit = e ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckenterkey.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckenterkey.js (revision 131) @@ -108,4 +108,8 @@ oRange.MoveToSelection() ; + if ( !oRange.CheckIsCollapsed() ) + return false ; + + var oStartBlock = oRange.StartBlock ; var oEndBlock = oRange.EndBlock ; @@ -242,22 +246,13 @@ var oRange = new FCKDomRange( this.Window ) ; oRange.MoveToSelection() ; - - // The selection boundaries must be in the same "block limit" element - if ( oRange.StartBlockLimit == oRange.EndBlockLimit && oRange.StartBlock && oRange.EndBlock ) - { - if ( oRange.StartBlock != oRange.EndBlock ) - { - this.DoEnter() ; - oRange.MoveToSelection() ; - } - - if ( oRange.CheckEndOfBlock() ) - { - var oCurrentBlock = oRange.StartBlock ; - - var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ], ['UL','OL'] ) ; - - bCustom = this._ExecuteBackspace( oRange, oCurrentBlock, eNext ) ; - } + + // There is just one special case for collapsed selections at the end of a block. + if ( oRange.CheckIsCollapsed() && oRange.CheckEndOfBlock( FCKBrowserInfo.IsGecko ) ) + { + var oCurrentBlock = oRange.StartBlock ; + + var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ], ['UL','OL'] ) ; + + bCustom = this._ExecuteBackspace( oRange, oCurrentBlock, eNext ) ; } @@ -370,4 +365,13 @@ // Place the extracted contents in the duplicated block. eDocFrag.AppendTo( eNewBlock ) ; + + if ( FCKBrowserInfo.IsGecko ) + { + // In Gecko, the last child node must be a bogus
. + var eLastChild = FCKDomTools.GetLastChild( eNewBlock ) ; + + if ( !eLastChild || eLastChild.nodeName.toLowerCase() != 'br' || eLastChild.getAttribute( 'type', 2 ) != '_moz' ) + eNewBlock.appendChild( FCKTools.CreateBogusBR( this.Window.document ) ) ; + } } Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js (revision 131) @@ -108,5 +108,12 @@ var oDocument = this.EditorDocument ; + + if ( !oDocument ) + return ; + var oBody = oDocument.body ; + + if ( !oBody ) + return ; FCKDomTools.TrimNode( oBody ) ; @@ -171,4 +178,7 @@ var sXHTML ; var oDoc = FCK.EditorDocument ; + + if ( !oDoc ) + return null ; if ( FCKConfig.FullPage ) @@ -513,4 +523,7 @@ sHtml = FCK.GetXHTML( FCKConfig.FormatSource ) ; + + if ( sHtml == null ) + return false ; } else @@ -526,4 +539,6 @@ // Update the toolbar (Running it directly causes IE to fail). FCKTools.RunFunction( FCK.ToolbarSet.RefreshModeState, FCK.ToolbarSet ) ; + + return true ; }, Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckdomtools.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckdomtools.js (revision 131) @@ -126,5 +126,5 @@ while( eChild ) { - if ( eChild.nodeType == 1 && eChild.tagName.Equals( childNames ) ) + if ( eChild.nodeType == 1 && ( !childNames || eChild.tagName.Equals( childNames ) ) ) return eChild ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckregexlib.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckregexlib.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckregexlib.js (revision 131) @@ -81,11 +81,15 @@ // We are not handling and as block elements, for now. BlockElements : { address:1,blockquote:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 }, + + // Block elements that may be filled with   if empty. + NonEmptyBlockElements : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 }, + // Elements that may be considered the "Block boundary" in an element path. + PathBlockElements : { address:1,blockquote:1,div:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1 }, + // Inline elements which MUST have child nodes. InlineChildReqElements : { abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strong:1,sub:1,sup:1,tt:1,'var':1 }, // Elements marked as empty "Empty" in the XHTML DTD. - EmptyElements : { base:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 }, - - BlockElements : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 } + EmptyElements : { base:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 } } ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml.js (revision 131) @@ -47,4 +47,6 @@ // Remove the trailing
added by Gecko. + // REMOVE: Maybe the following is not anymore necessary because a similar + // check is made on _AppendNode if ( FCKBrowserInfo.IsGecko ) sXHTML = sXHTML.replace( /$/, '' ) ; @@ -80,5 +82,5 @@ try { - if ( !attributeValue ) + if ( attributeValue == undefined || attributeValue == null ) attributeValue = '' ; else if ( attributeValue.replace ) @@ -104,4 +106,9 @@ FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement ) { + // Trim block elements. This is also needed to avoid Firefox leaving extra + // BRs at the end of them (check made inside _AppendNode). + if ( isBlockElement ) + FCKDomTools.TrimNode( htmlNode ) ; + var iCount = 0 ; @@ -121,5 +128,5 @@ { this._AppendEntity( xmlNode, 'nbsp' ) ; - return ; + return xmlNode ; } @@ -128,5 +135,5 @@ // Some inline elements are required to have something inside (span, strong, etc...). if ( FCKListsLib.InlineChildReqElements[ sNodeName ] ) - xmlNode.parentNode.removeChild( xmlNode ) ; + return null ; // We can't use short representation of empty elements that are not marked @@ -135,4 +142,6 @@ xmlNode.appendChild( this.XML.createTextNode('') ) ; } + + return xmlNode ; } @@ -182,5 +191,6 @@ return false ; - if ( sNodeName == 'br' && htmlNode.getAttribute( 'type', 2 ) == '_moz' ) + // Remove the
if it is a bogus node or is the last child. + if ( sNodeName == 'br' && ( htmlNode.getAttribute( 'type', 2 ) == '_moz' || !htmlNode.nextSibling ) ) return false ; @@ -201,10 +211,10 @@ if ( oTagProcessor ) - { oNode = oTagProcessor( oNode, htmlNode, xmlNode ) ; - if ( !oNode ) break ; - } else - this._AppendChildNodes( oNode, htmlNode, Boolean( FCKListsLib.BlockElements[ sNodeName ] ) ) ; + oNode = this._AppendChildNodes( oNode, htmlNode, Boolean( FCKListsLib.NonEmptyBlockElements[ sNodeName ] ) ) ; + + if ( !oNode ) + break ; xmlNode.appendChild( oNode ) ; @@ -214,6 +224,5 @@ // Text Node. case 3 : - this._AppendTextNode( xmlNode, htmlNode.nodeValue.ReplaceNewLineChars(' ') ) ; - break ; + return this._AppendTextNode( xmlNode, htmlNode.nodeValue.ReplaceNewLineChars(' ') ) ; // Comment @@ -268,6 +277,8 @@ FCKXHtml._AppendTextNode = function( targetNode, textValue ) { - targetNode.appendChild( this.XML.createTextNode( textValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ) ) ; - return ; + var bHadText = textValue.length > 0 ; + if ( bHadText ) + targetNode.appendChild( this.XML.createTextNode( textValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ) ) ; + return bHadText ; } @@ -316,4 +327,8 @@ a : function( node, htmlNode ) { + // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878). + if ( htmlNode.innerHTML.Trim().length == 0 && !htmlNode.name ) + return false ; + var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ; if ( sSavedUrl != null ) @@ -332,8 +347,4 @@ FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; - - // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878). - if ( node.childNodes.length == 0 && !node.getAttribute( 'name' ) ) - return false ; return node ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml_ie.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckxhtml_ie.js (revision 131) @@ -173,5 +173,5 @@ FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ; - FCKXHtml._AppendChildNodes( node, htmlNode ) ; + FCKXHtml._AppendChildNodes( node, htmlNode, true ) ; return node ; Index: /FCKeditor/branches/versions/2.4.x/editor/dialog/common/fck_dialog_common.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/dialog/common/fck_dialog_common.js (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/dialog/common/fck_dialog_common.js (revision 131) @@ -36,7 +36,7 @@ return valueIfNull ? valueIfNull : '' ; - var oValue ; + var oValue = element.getAttribute( attName, 2 ) ; - if ( !( oValue = element.getAttribute( attName, 2 ) ) ) + if ( oValue == null ) oValue = oAtt.nodeValue ; Index: /FCKeditor/branches/versions/2.4.x/editor/dialog/fck_about.html =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/dialog/fck_about.html (revision 130) +++ /FCKeditor/branches/versions/2.4.x/editor/dialog/fck_about.html (revision 131) @@ -94,6 +94,6 @@