Index: /FCKeditor/releases/latest/_samples/html/sample03.html =================================================================== --- /FCKeditor/releases/latest/_samples/html/sample03.html (revision 1149) +++ /FCKeditor/releases/latest/_samples/html/sample03.html (revision 1150) @@ -39,4 +39,7 @@ var oCombo = document.getElementById( 'cmbLanguages' ) ; + + // Remove all options. (#1399) + oCombo.innerHTML = '' ; var aLanguages = new Array() ; Index: /FCKeditor/releases/latest/_whatsnew.html =================================================================== --- /FCKeditor/releases/latest/_whatsnew.html (revision 1149) +++ /FCKeditor/releases/latest/_whatsnew.html (revision 1150) @@ -22,12 +22,129 @@ - FCKeditor - What's New? + FCKeditor ChangeLog - What's New? +

+ FCKeditor ChangeLog - What's New?

+

+ Version 2.5

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.5 Beta

@@ -68,16 +185,16 @@ the "Remove All" button, by using the "RemoveFormatTags" setting. -
  • [#1231] - [#160] Paragraph - indentation and justification now uses style attributes and don't - create unnecessary elements, and <blockquote> is not anymore used for it. - Now, even CSS classes can be used to indent or align text.
    • +
  • [#1231] [#160] Paragraph indentation + and justification now uses style attributes and don't create unnecessary + elements, and <blockquote> is not anymore used for it. Now, even CSS classes + can be used to indent or align text.
  • All paragraph formatting features work well when EnterMode=br.
    • -
  • [#172] - All paragraph formatting features work well when list items too.
    • +
  • [#172] All paragraph + formatting features work well when list items too.
    • -
  • [#1197] - [#132] The toolbar +
  • [#1197] [#132] The toolbar now presents a new button for Blockquote. The indentation button will not anymore be used for that.
    • @@ -148,6 +265,6 @@
  • [#1060] Compatibility checks with Firefox 3.0 Alpha.
    • -
  • [#817] - [#1077] New "Merge +
  • [#817] [#1077] New "Merge Down/Right" commands for merging tables cells in non-Gecko browsers.
  • [#1288] The "More @@ -156,9 +273,9 @@
  • [#356] The Find and Replace dialogs are now unified into a single dialog with tabs.
    • -
  • [#549] Added a 'None' - option to the FCKConfig.ToolbarLocation option to allow for hidden toolbars. -
    • -
  • [#1313] An XHTML 1.1 target - editor sample has been created as sample14.html.
    • +
  • [#549] Added a + 'None' option to the FCKConfig.ToolbarLocation option to allow for hidden toolbars. +
    • +
  • [#1313] An XHTML + 1.1 target editor sample has been created as sample14.html.
  • The ASP, ColdFusion and PHP integration have been aligned to our standards.
    • @@ -294,5 +411,5 @@ system now properly handles Format styles when EnterMode=br.
  • [#525] The union - if successive DIVs will work properly now if EnterMode!=div.
    • + of successive DIVs will work properly now if EnterMode!=div.
  • [#1227] The color commands used an unnecessary temporary variable. Thanks to Matthias Miller
    • @@ -315,5 +432,5 @@
  • [#205] Fixed the - issue where visible >br< tags at the end of paragraphs are incorrectly removed + issue where visible <br> tags at the end of paragraphs are incorrectly removed after switching to and from source mode.
  • [#1050] Fixed @@ -326,5 +443,5 @@
  • [#135] Fixed the issue where context menus are misplaced in FCKeditor when FCKeditor is created inside - a >div< node with scrolling.
    • + a <div> node with scrolling.
  • [#1067] Fixed the issue where context menus are misplaced in Safari when FCKeditor is scrolled @@ -404,42 +521,43 @@
  • [#923] Font colors are now properly applied on links.
    • -
  • [#1316] Fixed the issue - where the image dialog expands to a size too big in Safari.
    • -
  • [#1306] - [#894] - The undo system can now undo text formatting steps like setting fonts to bold and italic.
    • -
  • [#95] Fixed the issue where - FCKeditor breaks <meta> tags in full page mode in some circumstances.
    • -
  • [#175] Fixed the issue - where entering an email address with a '%' sign in the insert link dialog would cause - JavaScript error.
    • -
  • [#180] Improved backward - compatibility with older PHP versions. FCKeditor can now work with PHP versions down to - 4.0.
    • -
  • [#192] Document modifying - actions from the FCKeditor JavaScript API will now save undo steps.
    • -
  • [#246] Using text formatting - commands in EnterMode=div will no longer cause tags to randomly disappear.
    • -
  • [#327] It is no longer - possible for the browser's back action to misfire when a user presses backspace while an - image is being selected in FCKeditor.
    • -
  • [#362] Ctrl-Backspace now - works in FCKeditor.
    • -
  • [#390] Text alignment and - justification commands now respects EnterMode=br paragraph rules.
    • -
  • [#534] Pressing Ctrl-End - while the document contains a list towards the end will no longer make the cursor - disappear.
    • -
  • [#906] It is now possible - to have XHTML 1.0 Strict compliant output from a document pasted from Word.
    • -
  • [#929] Pressing the Enter - key will now produce an undo step.
    • -
  • [#934] Fixed the "Cannot - execute code from a freed script" error in IE from editor dialogs.
    • -
  • [#942] Server based spell - checking with ColdFusion integration no longer breaks fir non en_US languages.
    • -
  • [#1056] Deleting everything - in the editor document and moving the cursor around will no longer leave the cursor hanging - beyond the top of the editor document.
    • +
  • [#1316] Fixed + the issue where the image dialog expands to a size too big in Safari.
    • +
  • [#1306] [#894] The undo system + can now undo text formatting steps like setting fonts to bold and italic.
    • +
  • [#95] Fixed the + issue where FCKeditor breaks <meta> tags in full page mode in some circumstances.
    • +
  • [#175] Fixed the + issue where entering an email address with a '%' sign in the insert link dialog + would cause JavaScript error.
    • +
  • [#180] Improved + backward compatibility with older PHP versions. FCKeditor can now work with PHP + versions down to 4.0.
    • +
  • [#192] Document + modifying actions from the FCKeditor JavaScript API will now save undo steps.
    • +
  • [#246] Using text + formatting commands in EnterMode=div will no longer cause tags to randomly disappear.
    • +
  • [#327] It is no + longer possible for the browser's back action to misfire when a user presses backspace + while an image is being selected in FCKeditor.
    • +
  • [#362] Ctrl-Backspace + now works in FCKeditor.
    • +
  • [#390] Text alignment + and justification commands now respects EnterMode=br paragraph rules.
    • +
  • [#534] Pressing + Ctrl-End while the document contains a list towards the end will no longer make + the cursor disappear.
    • +
  • [#906] It is now + possible to have XHTML 1.0 Strict compliant output from a document pasted from Word.
    • +
  • [#929] Pressing + the Enter key will now produce an undo step.
    • +
  • [#934] Fixed the + "Cannot execute code from a freed script" error in IE from editor dialogs.
    • +
  • [#942] Server + based spell checking with ColdFusion integration no longer breaks fir non en_US + languages.
    • +
  • [#1056] Deleting + everything in the editor document and moving the cursor around will no longer leave + the cursor hanging beyond the top of the editor document.

    • Index: /FCKeditor/releases/latest/_whatsnew_history.html =================================================================== --- /FCKeditor/releases/latest/_whatsnew_history.html (revision 1149) +++ /FCKeditor/releases/latest/_whatsnew_history.html (revision 1150) @@ -22,12 +22,15 @@ - FCKeditor - What's New? + FCKeditor ChangeLog - What's New? +

    + FCKeditor ChangeLog - What's New?

    Version 2.4.3

    Index: /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js (revision 1150) @@ -174,91 +174,148 @@ }, + /** + * Checks if the start boundary of the current range is "visually" (like a + * selection caret) at the beginning of the block. It means that some + * things could be brefore the range, like spaces or empty inline elements, + * but it would still be considered at the beginning of the block. + */ CheckStartOfBlock : function() { - var bIsStartOfBlock = this._Cache.IsStartOfBlock ; + var cache = this._Cache ; + var bIsStartOfBlock = cache.IsStartOfBlock ; if ( bIsStartOfBlock != undefined ) return bIsStartOfBlock ; - // Create a clone of the current range. - var oTestRange = this.Clone() ; - - // Collapse it to its start point. - oTestRange.Collapse( true ) ; - - // Move the start boundary to the start of the block. - oTestRange.SetStart( oTestRange.StartBlock || oTestRange.StartBlockLimit, 1 ) ; - - if ( oTestRange.CheckIsCollapsed() ) - bIsStartOfBlock = true ; + // Take the block reference. + var block = this.StartBlock || this.StartBlockLimit ; + + var container = this._Range.startContainer ; + var offset = this._Range.startOffset ; + var currentNode ; + + if ( offset > 0 ) + { + // First, check the start container. If it is a text node, get the + // substring of the node value before the range offset. + if ( container.nodeType == 3 ) + { + var textValue = container.nodeValue.substr( 0, offset ).Trim() ; + + // If we have some text left in the container, we are not at + // the end for the block. + if ( textValue.length != 0 ) + return cache.IsStartOfBlock = false ; + } + else + currentNode = container.childNodes[ offset - 1 ] ; + } + + // We'll not have a currentNode if the container was a text node, or + // the offset is zero. + if ( !currentNode ) + currentNode = FCKDomTools.GetPreviousSourceNode( container, true, null, block ) ; + + while ( currentNode ) + { + switch ( currentNode.nodeType ) + { + case 1 : + // It's not an inline element. + if ( !FCKListsLib.InlineChildReqElements[ currentNode.nodeName.toLowerCase() ] ) + return cache.IsStartOfBlock = false ; + + break ; + + case 3 : + // It's a text node with real text. + if ( currentNode.nodeValue.Trim().length > 0 ) + return cache.IsStartOfBlock = false ; + } + + currentNode = FCKDomTools.GetPreviousSourceNode( currentNode, false, null, block ) ; + } + + return cache.IsStartOfBlock = true ; + }, + + /** + * Checks if the end boundary of the current range is "visually" (like a + * selection caret) at the end of the block. It means that some things + * could be after the range, like spaces, empty inline elements, or a + * single
    , but it would still be considered at the end of the block. + */ + CheckEndOfBlock : function( refreshSelection ) + { + var isEndOfBlock = this._Cache.IsEndOfBlock ; + + if ( isEndOfBlock != undefined ) + return isEndOfBlock ; + + // Take the block reference. + var block = this.EndBlock || this.EndBlockLimit ; + + var container = this._Range.endContainer ; + var offset = this._Range.endOffset ; + var currentNode ; + + // First, check the end container. If it is a text node, get the + // substring of the node value after the range offset. + if ( container.nodeType == 3 ) + { + var textValue = container.nodeValue ; + if ( offset < textValue.length ) + { + textValue = textValue.substr( offset ) ; + + // If we have some text left in the container, we are not at + // the end for the block. + if ( textValue.Trim().length != 0 ) + return this._Cache.IsEndOfBlock = false ; + } + } else - { - // Inserts the contents of the range in a div tag. - var eToolDiv = oTestRange.Window.document.createElement( 'div' ) ; - oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ; - - // This line is why we don't use CheckIsEmpty() here... - // Because using RTrimNode() or TrimNode() would be incorrect - - // TrimNode() and RTrimNode() would delete
    nodes at the end of the div node, - // but for checking start of block they are actually meaningful. (Bug #1350) - FCKDomTools.LTrimNode( eToolDiv ) ; - - bIsStartOfBlock = ( eToolDiv.innerHTML.length == 0 ) ; - } - - oTestRange.Release() ; - - return ( this._Cache.IsStartOfBlock = bIsStartOfBlock ) ; - }, - - CheckEndOfBlock : function( refreshSelection ) - { - var bIsEndOfBlock = this._Cache.IsEndOfBlock ; - - if ( bIsEndOfBlock != undefined ) - return bIsEndOfBlock ; - - // Create a clone of the current range. - var oTestRange = this.Clone() ; - - // Collapse it to its end point. - oTestRange.Collapse( false ) ; - - // Move the end boundary to the end of the block. - oTestRange.SetEnd( oTestRange.EndBlock || oTestRange.EndBlockLimit, 2 ) ; - - bIsEndOfBlock = oTestRange.CheckIsCollapsed() ; - - if ( !bIsEndOfBlock ) - { - // Inserts the contents of the range in a div tag. - var eToolDiv = this.Window.document.createElement( 'div' ) ; - oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ; - FCKDomTools.TrimNode( eToolDiv ) ; - - // Find out if we are in an empty tree of inline elements, like - bIsEndOfBlock = true ; - var eLastChild = eToolDiv ; - while ( ( eLastChild = eLastChild.lastChild ) ) + currentNode = container.childNodes[ offset ] ; + + // We'll not have a currentNode if the container was a text node, of + // the offset is out the container children limits (after it probably). + if ( !currentNode ) + currentNode = FCKDomTools.GetNextSourceNode( container, true, null, block ) ; + + var hadBr = false ; + + while ( currentNode ) + { + switch ( currentNode.nodeType ) { - // Check the following: - // 1. Is there more than one node in the parents children? - // 2. Is the node not an element node? - // 3. Is it not a inline element. - if ( eLastChild.previousSibling || eLastChild.nodeType != 1 || FCKListsLib.InlineChildReqElements[ eLastChild.nodeName.toLowerCase() ] == null ) - { - // So we are not in the end of the range. - bIsEndOfBlock = false ; - break ; - } + case 1 : + var nodeName = currentNode.nodeName.toLowerCase() ; + + // It's an inline element. + if ( FCKListsLib.InlineChildReqElements[ nodeName ] ) + break ; + + // It is the first
    found. + if ( nodeName == 'br' && !hadBr ) + { + hadBr = true ; + break ; + } + + return this._Cache.IsEndOfBlock = false ; + + case 3 : + // It's a text node with real text. + if ( currentNode.nodeValue.Trim().length > 0 ) + return this._Cache.IsEndOfBlock = false ; } - } - - oTestRange.Release() ; + + currentNode = FCKDomTools.GetNextSourceNode( currentNode, false, null, block ) ; + } if ( refreshSelection ) this.Select() ; - return this._Cache.IsEndOfBlock = bIsEndOfBlock ; + return this._Cache.IsEndOfBlock = true ; }, @@ -321,5 +378,5 @@ oBookmark.EndNode = eEndSpan ; } - + // Update the range position. if ( eEndSpan ) @@ -330,5 +387,5 @@ else this.MoveToPosition( eStartSpan, 4 ) ; - + return oBookmark ; }, @@ -383,9 +440,16 @@ "End" : [ this._Range.endOffset ] } ; + // Since we're treating the document tree as normalized, we need to backtrack the text lengths + // of previous text nodes into the offset value. var curStart = this._Range.startContainer.previousSibling ; var curEnd = this._Range.endContainer.previousSibling ; + + // Also note that the node that we use for "address base" would change during backtracking. + var addrStart = this._Range.startContainer ; + var addrEnd = this._Range.endContainer ; while ( curStart && curStart.nodeType == 3 ) { bookmark.Start[0] += curStart.length ; + addrStart = curStart ; curStart = curStart.previousSibling ; } @@ -393,10 +457,39 @@ { bookmark.End[0] += curEnd.length ; + addrEnd = curEnd ; curEnd = curEnd.previousSibling ; } + + // If the object pointed to by the startOffset and endOffset are text nodes, we need + // to backtrack and add in the text offset to the bookmark addresses. + if ( addrStart.nodeType == 1 && addrStart.childNodes[bookmark.Start[0]] && addrStart.childNodes[bookmark.Start[0]].nodeType == 3 ) + { + var curNode = addrStart.childNodes[bookmark.Start[0]] ; + var offset = 0 ; + while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 ) + { + curNode = curNode.previousSibling ; + offset += curNode.length ; + } + addrStart = curNode ; + bookmark.Start[0] = offset ; + } + if ( addrEnd.nodeType == 1 && addrEnd.childNodes[bookmark.End[0]] && addrEnd.childNodes[bookmark.End[0]].nodeType == 3 ) + { + var curNode = addrEnd.childNodes[bookmark.End[0]] ; + var offset = 0 ; + while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 ) + { + curNode = curNode.previousSibling ; + offset += curNode.length ; + } + addrEnd = curNode ; + bookmark.End[0] = offset ; + } + // Then, we record down the precise position of the container nodes // by walking up the DOM tree and counting their childNode index - bookmark.Start = FCKDomTools.GetNodeAddress( this._Range.startContainer, true ).concat( bookmark.Start ) ; - bookmark.End = FCKDomTools.GetNodeAddress( this._Range.endContainer, true ).concat( bookmark.End ) ; + bookmark.Start = FCKDomTools.GetNodeAddress( addrStart, true ).concat( bookmark.Start ) ; + bookmark.End = FCKDomTools.GetNodeAddress( addrEnd, true ).concat( bookmark.End ) ; return bookmark; }, @@ -531,5 +624,5 @@ if ( oNode.nodeType != 1 ) oNode = oNode.previousSibling ? null : oNode.parentNode ; - + if ( oNode ) { @@ -666,4 +759,5 @@ var eStartBlock = this.StartBlock ; var eEndBlock = this.EndBlock ; + var oElementPath = null ; if ( FCKConfig.EnterMode != 'br' ) @@ -691,4 +785,5 @@ if ( bIsEndOfBlock ) { + oElementPath = new FCKElementPath( this.StartContainer ) ; this.MoveToPosition( eEndBlock, 4 ) ; eEndBlock = null ; @@ -696,4 +791,5 @@ else if ( bIsStartOfBlock ) { + oElementPath = new FCKElementPath( this.StartContainer ) ; this.MoveToPosition( eStartBlock, 3 ) ; eStartBlock = null ; @@ -728,5 +824,6 @@ NextBlock : eEndBlock, WasStartOfBlock : bIsStartOfBlock, - WasEndOfBlock : bIsEndOfBlock + WasEndOfBlock : bIsEndOfBlock, + ElementPath : oElementPath } ; } @@ -784,24 +881,24 @@ return !!this._Range ; }, - + GetTouchedStartNode : function() { var range = this._Range ; var container = range.startContainer ; - + if ( range.collapsed || container.nodeType != 1 ) return container ; - + return container.childNodes[ range.startOffset ] || container ; }, - + GetTouchedEndNode : function() { var range = this._Range ; var container = range.endContainer ; - + if ( range.collapsed || container.nodeType != 1 ) return container ; - + return container.childNodes[ range.endOffset - 1 ] || container ; } Index: /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_gecko.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_gecko.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_gecko.js (revision 1150) @@ -36,5 +36,6 @@ } else - this.MoveToElementStart( this.Window.document.body ) ; + if ( this.Window.document ) + this.MoveToElementStart( this.Window.document.body ) ; } Index: /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_ie.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_ie.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckdomrange_ie.js (revision 1150) @@ -67,13 +67,13 @@ } -FCKDomRange.prototype.Select = function() +FCKDomRange.prototype.Select = function( forceExpand ) { if ( this._Range ) - this.SelectBookmark( this.CreateBookmark( true ) ) ; + this.SelectBookmark( this.CreateBookmark( true ), forceExpand ) ; } // Not compatible with bookmark created with CreateBookmark2. // The bookmark nodes will be deleted from the document. -FCKDomRange.prototype.SelectBookmark = function( bookmark ) +FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand ) { var bIsCollapsed = this.CheckIsCollapsed() ; @@ -112,5 +112,5 @@ else { - bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; + bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; // Append a temporary   before the selection. @@ -120,5 +120,5 @@ // element to avoid the selection moving inside of it. dummySpan = this.Window.document.createElement( 'span' ) ; - dummySpan.innerHTML = ' ' ; + dummySpan.innerHTML = '' ; // Zero Width No-Break Space (U+FEFF). See #1359. eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ; @@ -126,7 +126,8 @@ { // To expand empty blocks or line spaces after
    , we need - // instead to have a  , which will be later deleted using the + // instead to have any char, which will be later deleted using the // selection. - eStartMarker.parentNode.insertBefore( this.Window.document.createTextNode( '\u00a0' ), eStartMarker ) ; + // \ufeff = Zero Width No-Break Space (U+FEFF). See #1359. + eStartMarker.parentNode.insertBefore( this.Window.document.createTextNode( '\ufeff' ), eStartMarker ) ; } } Index: /FCKeditor/releases/latest/editor/_source/classes/fckdomrangeiterator.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckdomrangeiterator.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckdomrangeiterator.js (revision 1150) @@ -266,4 +266,5 @@ removePreviousBr = !splitInfo.WasStartOfBlock ; removeLastBr = !splitInfo.WasEndOfBlock ; + FCKDebug.Output( 'removePreviousBr=' + removePreviousBr + ',removeLastBr=' + removeLastBr ) ; // Insert the new block into the DOM. @@ -286,6 +287,11 @@ { var previousSibling = block.previousSibling ; - if ( previousSibling && previousSibling.nodeType == 1 && previousSibling.nodeName.toLowerCase() == 'br' ) - previousSibling.parentNode.removeChild( previousSibling ) ; + if ( previousSibling && previousSibling.nodeType == 1 ) + { + if ( previousSibling.nodeName.toLowerCase() == 'br' ) + previousSibling.parentNode.removeChild( previousSibling ) ; + else if ( previousSibling.lastChild && previousSibling.lastChild.nodeName.IEquals( 'br' ) ) + previousSibling.removeChild( previousSibling.lastChild ) ; + } } Index: /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js (revision 1150) @@ -279,14 +279,9 @@ this._EnsureFocusIE() ; - if ( FCKBrowserInfo.IsSafari ) - this.IFrame.focus() ; - else - { - this.Window.focus() ; - - // In IE it can happen that the document is in theory focused but the active element is outside it - if ( FCKBrowserInfo.IsIE ) - this._EnsureFocusIE() ; - } + this.Window.focus() ; + + // In IE it can happen that the document is in theory focused but the active element is outside it + if ( FCKBrowserInfo.IsIE ) + this._EnsureFocusIE() ; } else @@ -310,16 +305,19 @@ var range = this.Document.selection.createRange() ; - // Only apply the fix when in a block and the block is empty. var parentNode = range.parentElement() ; - - if ( ! ( parentNode.childNodes.length == 0 && ( - FCKListsLib.BlockElements[parentNode.nodeName.toLowerCase()] || - FCKListsLib.NonEmptyBlockElements[parentNode.nodeName.toLowerCase()] ) ) ) + var parentTag = parentNode.nodeName.toLowerCase() ; + + // Only apply the fix when in a block, and the block is empty. + if ( parentNode.childNodes.length > 0 || + !( FCKListsLib.BlockElements[parentTag] || + FCKListsLib.NonEmptyBlockElements[parentTag] ) ) + { return ; - - var oldLength = range.text.length ; + } + range.moveEnd( "character", 1 ) ; range.select() ; - if ( range.text.length > oldLength ) + + if ( range.boundingWidth > 0 ) { range.moveEnd( "character", -1 ) ; Index: /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js (revision 1150) @@ -111,5 +111,5 @@ var parentPath = new FCKElementPath( parentElement ) ; var sMode = mode || this.EnterMode ; - + if ( sMode == 'br' || parentPath.Block && parentPath.Block.tagName.toLowerCase() == 'pre' ) return this._ExecuteEnterBr() ; @@ -337,5 +337,5 @@ var eCurrentCell = FCKTools.GetElementAscensor( oCurrentBlock, 'td' ); - var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ], + var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ], ['UL','OL','TR'] ) ; @@ -396,5 +396,7 @@ var oSplitInfo = oRange.SplitBlock() ; - + + // FCKDebug.OutputObject( oSplitInfo ) ; + if ( oSplitInfo ) { @@ -411,4 +413,9 @@ if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock ) { + // If the next block is an
  • with another list tree as the first child + // We'll need to append a placeholder or the list item wouldn't be editable. (Bug #1420) + if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild + && eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) ) + eNextBlock.insertBefore( eNextBlock.ownerDocument.createTextNode( '\xa0' ), eNextBlock.firstChild ) ; // Move the selection to the end block. if ( eNextBlock ) @@ -432,21 +439,35 @@ // If is a header tag, or we are in a Shift+Enter (#77), - // create a new block element. - if ( this._HasShift || (/^H[1-6]$/).test( sPreviousBlockTag ) ) - eNewBlock = this.Window.document.createElement( blockTag ) ; - else + // create a new block element (later in the code). + if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) ) { // Otherwise, duplicate the previous block. eNewBlock = FCKDomTools.CloneElement( ePreviousBlock ) ; - - this._RecreateEndingTree( ePreviousBlock, eNewBlock ) ; } } else if ( eNextBlock ) - { eNewBlock = FCKDomTools.CloneElement( eNextBlock ) ; - } - else + + if ( !eNewBlock ) eNewBlock = this.Window.document.createElement( blockTag ) ; + + // Recreate the inline elements tree, which was available + // before the hitting enter, so the same styles will be + // available in the new block. + var elementPath = oSplitInfo.ElementPath ; + if ( elementPath ) + { + var eFocusElement = eNewBlock ; + for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ ) + { + var element = elementPath.Elements[i] ; + + if ( element == elementPath.Block || element == elementPath.BlockLimit ) + break ; + + if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] ) + eFocusElement = eFocusElement.appendChild( FCKDomTools.CloneElement( element ) ) ; + } + } if ( FCKBrowserInfo.IsGeckoLike ) @@ -464,9 +485,12 @@ } + // Move the selection to the new block. oRange.MoveToElementEditStart( bIsStartOfBlock && !bIsEndOfBlock ? eNextBlock : eNewBlock ) ; - - if ( FCKBrowserInfo.IsGeckoLike ) - eNewBlock.scrollIntoView( false ) ; - } + } + + if ( FCKBrowserInfo.IsSafari ) + FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; + else if ( FCKBrowserInfo.IsGeckoLike ) + ( eNextBlock || eNewBlock ).scrollIntoView( false ) ; oRange.Select() ; @@ -499,4 +523,5 @@ var bHasShift = this._HasShift ; + var bIsPre = false ; if ( !bHasShift && sStartBlockTag == 'LI' ) @@ -518,6 +543,7 @@ else { - var eLineBreak = null ; - if ( sStartBlockTag.IEquals( 'pre' ) ) + var eLineBreak ; + bIsPre = sStartBlockTag.IEquals( 'pre' ) ; + if ( bIsPre ) eLineBreak = this.Window.document.createTextNode( FCKBrowserInfo.IsIE ? '\r' : '\n' ) ; else @@ -546,6 +572,12 @@ else dummy = this.Window.document.createElement( 'br' ) ; + eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ; - dummy.scrollIntoView( false ) ; + + if ( FCKBrowserInfo.IsSafari ) + FCKDomTools.ScrollIntoView( dummy, false ) ; + else + dummy.scrollIntoView( false ) ; + dummy.parentNode.removeChild( dummy ) ; } @@ -555,5 +587,5 @@ oRange.Collapse( true ) ; - oRange.Select() ; + oRange.Select( bIsPre ) ; } @@ -564,14 +596,4 @@ } -// Recreate the elements tree at the end of the source block, at the beginning -// of the target block. Eg.: -// If source =

    Some sample text

    then target =

    -// If source =

    Some sample text

    then target =

    -FCKEnterKey.prototype._RecreateEndingTree = function( source, target ) -{ - while ( ( source = source.lastChild ) && source.nodeType == 1 && FCKListsLib.InlineChildReqElements[ source.nodeName.toLowerCase() ] != null ) - target = target.insertBefore( FCKDomTools.CloneElement( source ), target.firstChild ) ; -} - // Outdents a LI, maintaining the selection defined on a range. FCKEnterKey.prototype._OutdentWithSelection = function( li, range ) @@ -590,5 +612,5 @@ var startOk = false ; var endOk = false ; - + /* FCKDebug.Output( 'sc='+range.StartContainer.nodeName+ Index: /FCKeditor/releases/latest/editor/_source/classes/fckevents.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckevents.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckevents.js (revision 1150) @@ -35,5 +35,10 @@ this._RegisteredEvents[ eventName ] = [ functionPointer ] ; else - aTargets.push( functionPointer ) ; + { + // Check that the event handler isn't already registered with the same listener + // It doesn't detect function pointers belonging to an object (at least in Gecko) + if ( aTargets.IndexOf( functionPointer ) == -1 ) + aTargets.push( functionPointer ) ; + } } Index: /FCKeditor/releases/latest/editor/_source/classes/fckmenublock.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckmenublock.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckmenublock.js (revision 1150) @@ -95,4 +95,7 @@ function FCKMenuBlock_Item_OnClick( clickedItem, menuBlock ) { + if ( menuBlock.Hide ) + menuBlock.Hide() ; + FCKTools.RunFunction( menuBlock.OnClick, menuBlock, [ clickedItem ] ) ; } Index: /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js (revision 1150) @@ -167,5 +167,15 @@ if ( this.ParentPanel ) + { this.ParentPanel.Lock() ; + + // Due to a bug on FF3, we must ensure that the parent panel will + // blur (#1584). + FCKPanel_Window_OnBlur( null, this.ParentPanel ) ; + } + + // Be sure we'll not have more than one Panel opened at the same time. + if ( FCKPanel._OpenedPanel ) + FCKPanel._OpenedPanel.Hide() ; FCKDomTools.SetElementStyles( eMainNode, @@ -189,15 +199,24 @@ iMainWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; - var oPos = FCKTools.GetElementPosition( + // Base the popup coordinates upon the coordinates of relElement. + var oPos = FCKTools.GetDocumentPosition( this._Window, relElement.nodeType == 9 ? ( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) : - relElement, - this._Window ) ; + relElement ) ; + + // Minus the offsets provided by any positioned parent element of the panel iframe. + var positionedAncestor = FCKDomTools.GetPositionedAncestor( FCKTools.GetElementWindow( this._IFrame ), this._IFrame.parentNode ) ; + if ( positionedAncestor ) + { + var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ; + oPos.x -= nPos.x ; + oPos.y -= nPos.y ; + } if ( this.IsRTL && !this.IsContextMenu ) x = ( x * -1 ) ; - x += oPos.X ; - y += oPos.Y ; + x += oPos.x ; + y += oPos.y ; if ( this.IsRTL ) @@ -241,4 +260,6 @@ // Move the focus to the IFRAME so we catch the "onblur". this._IFrame.contentWindow.focus() ; + + FCKPanel._OpenedPanel = this ; } @@ -254,5 +275,5 @@ else { - if ( !this._IsOpened ) + if ( !this._IsOpened || this._LockCounter > 0 ) return ; Index: /FCKeditor/releases/latest/editor/_source/classes/fckspecialcombo.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckspecialcombo.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckspecialcombo.js (revision 1150) @@ -82,8 +82,5 @@ { if ( this.Items ) - { - for ( var key in this.Items ) - this.Items[key] = null ; - } + this.Items = {} ; var itemsholder = this._ItemsHolderEl ; @@ -193,5 +190,7 @@ this.Enabled = isEnabled ; - this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ; + // In IE it can happen when the page is reloaded that _OuterTable is null, so check its existence + if ( this._OuterTable ) + this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ; } Index: /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js (revision 1150) @@ -865,6 +865,6 @@ { // Check if the style element can be a child of the current - // node parent. - if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] ) + // node parent or if the element is not defined in the DTD. + if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] || !FCK.DTD[ elementName ] ) { // This node will be part of our range, so if it has not Index: /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbuttonui.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbuttonui.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbuttonui.js (revision 1150) @@ -127,4 +127,8 @@ var e = this.MainElement ; + // In IE it can happen when the page is reloaded that MainElement is null, so exit here + if ( !e ) + return ; + switch ( parseInt( newState, 10 ) ) { Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js (revision 1150) @@ -250,5 +250,13 @@ var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ; - FCK.InsertElement( oFakeImage ) ; + var oRange = new FCKDomRange( FCK.EditorWindow ) ; + oRange.MoveToSelection() ; + var oSplitInfo = oRange.SplitBlock() ; + if ( oSplitInfo.NextBlock ) + oSplitInfo.NextBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.NextBlock ) ; + else + oSplitInfo.PreviousBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.PreviousBlock.nextSibling ) ; + + FCK.Events.FireEvent( 'OnSelectionChange' ) ; } Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fckblockquotecommand.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/commandclasses/fckblockquotecommand.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/commandclasses/fckblockquotecommand.js (revision 1150) @@ -33,7 +33,50 @@ var state = this.GetState() ; + var range = new FCKDomRange( FCK.EditorWindow ) ; range.MoveToSelection() ; + var bookmark = range.CreateBookmark() ; + + // Kludge for #1592: if the bookmark nodes are in the beginning of + // blockquote, then move them to the nearest block element in the + // blockquote. + if ( FCKBrowserInfo.IsIE ) + { + var bStart = range.GetBookmarkNode( bookmark, true ) ; + var bEnd = range.GetBookmarkNode( bookmark, false ) ; + + var cursor ; + + if ( bStart + && bStart.parentNode.nodeName.IEquals( 'blockquote' ) + && !bStart.previousSibling ) + { + cursor = bStart ; + while ( ( cursor = cursor.nextSibling ) ) + { + if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] ) + FCKDomTools.MoveNode( bStart, cursor, true ) ; + } + } + + if ( bEnd + && bEnd.parentNode.nodeName.IEquals( 'blockquote' ) + && !bEnd.previousSibling ) + { + cursor = bEnd ; + while ( ( cursor = cursor.nextSibling ) ) + { + if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] ) + { + if ( cursor.firstChild == bStart ) + FCKDomTools.InsertAfterNode( bStart, bEnd ) ; + else + FCKDomTools.MoveNode( bEnd, cursor, true ) ; + } + } + } + } + var iterator = new FCKDomRangeIterator( range ) ; var block ; @@ -45,4 +88,17 @@ while ( ( block = iterator.GetNextParagraph() ) ) paragraphs.push( block ) ; + + // If no paragraphs, create one from the current selection position. + if ( paragraphs.length < 1 ) + { + para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ; + range.InsertNode( para ) ; + para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ; + range.MoveToBookmark( bookmark ) ; + range.MoveToNodeContents( para ) ; + range.Collapse( true ) ; + bookmark = range.CreateBookmark() ; + paragraphs.push( para ) ; + } // Make sure all paragraphs have the same parent. Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fckshowblocks.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/commandclasses/fckshowblocks.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/commandclasses/fckshowblocks.js (revision 1150) @@ -53,12 +53,10 @@ return FCK_TRISTATE_DISABLED ; - // On some cases FCK.EditorDocument.body is not yet available, so try/catch. - try - { - if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) ) - return FCK_TRISTATE_ON ; - } - catch (e) - {} + // On some cases FCK.EditorDocument.body is not yet available + if ( !FCK.EditorDocument ) + return FCK_TRISTATE_OFF ; + + if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) ) + return FCK_TRISTATE_ON ; return FCK_TRISTATE_OFF ; Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1150) @@ -55,4 +55,6 @@ FCKTextColorCommand.prototype.SetColor = function( color ) { + FCKUndo.SaveUndoStep() ; + var style = FCKStyles.GetStyle( '_FCK_' + ( this.Type == 'ForeColor' ? 'Color' : 'BackColor' ) ) ; @@ -65,4 +67,6 @@ FCKStyles.ApplyStyle( style ) ; } + + FCKUndo.SaveUndoStep() ; FCK.Focus() ; @@ -142,5 +146,6 @@ FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_AutoOnClick, this ) ; - if ( FCKBrowserInfo.IsSafari ) + // Dirty hack for Opera, Safari and Firefox 3. + if ( !FCKBrowserInfo.IsIE ) oDiv.style.width = '96%' ; @@ -154,14 +159,22 @@ var oRow = oTable.insertRow(-1) ; - for ( var i = 0 ; i < 8 && iCounter < aColors.length ; i++, iCounter++ ) + for ( var i = 0 ; i < 8 ; i++, iCounter++ ) { - var colorParts = aColors[iCounter].split('/') ; - var colorValue = '#' + colorParts[0] ; - var colorName = colorParts[1] || colorValue ; + // The div will be created even if no more colors are available. + // Extra divs will be hidden later in the code. (#1597) + if ( iCounter < aColors.length ) + { + var colorParts = aColors[iCounter].split('/') ; + var colorValue = '#' + colorParts[0] ; + var colorName = colorParts[1] || colorValue ; + } oDiv = oRow.insertCell(-1).appendChild( CreateSelectionDiv() ) ; oDiv.innerHTML = '
    ' ; - FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ; + if ( iCounter >= aColors.length ) + oDiv.style.visibility = 'hidden' ; + else + FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ; } } @@ -179,5 +192,6 @@ } - if ( FCKBrowserInfo.IsSafari ) + // Dirty hack for Opera, Safari and Firefox 3. + if ( !FCKBrowserInfo.IsIE ) oDiv.style.width = '96%' ; } Index: /FCKeditor/releases/latest/editor/_source/fckeditorapi.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/fckeditorapi.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/fckeditorapi.js (revision 1150) @@ -41,6 +41,6 @@ var sScript = 'var FCKeditorAPI = {' + - 'Version : "2.5 Beta",' + - 'VersionBuild : "16842",' + + 'Version : "2.5",' + + 'VersionBuild : "17350",' + '__Instances : new Object(),' + Index: /FCKeditor/releases/latest/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fck.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fck.js (revision 1150) @@ -57,5 +57,11 @@ return ( this.StartupValue != this.EditingArea.Textarea.value ) ; else + { + // It can happen switching between design and source mode in Gecko + if ( ! this.EditorDocument ) + return false ; + return ( this.StartupValue != this.EditorDocument.body.innerHTML ) ; + } }, @@ -105,4 +111,10 @@ // Tab key handling for source mode. FCKTools.AddEventListener( document, "keydown", this._TabKeyHandler ) ; + + // Add selection change listeners. They must be attached only once. + this.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ; + if ( FCKBrowserInfo.IsGecko ) + this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ; + }, @@ -165,5 +177,7 @@ // Element Node. case 1 : - if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] ) + if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] && + !oNode.getAttribute('_fckfakelement') && + oNode.getAttribute('_moz_dirty') == null ) bMoveNode = true ; break ; @@ -287,4 +301,7 @@ html = html.replace( FCKRegexLib.ProtectUrlsImg , '$& _fcksavedurl=$1' ) ; + // href + html = html.replace( FCKRegexLib.ProtectUrlsArea , '$& _fcksavedurl=$1' ) ; + return html ; }, @@ -340,4 +357,10 @@ { this.EditingArea.Mode = FCK.EditMode ; + + // If there was an onSelectionChange listener in IE we must remove it to avoid crashes #1498 + if ( FCKBrowserInfo.IsIE && FCK.EditorDocument ) + { + FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ; + } if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) @@ -784,4 +807,6 @@ if ( ! FCKBrowserInfo.IsIE && FCKDomTools.PaddingNode ) { + // Prevent the caret from going between the body and the padding node in Firefox. + // i.e. |

    var sel = FCK.EditorWindow.getSelection() ; if ( sel && sel.rangeCount == 1 ) @@ -797,4 +822,29 @@ } } + else if ( FCKDomTools.PaddingNode ) + { + // Prevent the caret from going into an empty body but not into the padding node in IE. + // i.e.

    | + var parentElement = FCKSelection.GetParentElement() ; + var paddingNode = FCKDomTools.PaddingNode ; + if ( parentElement && parentElement.nodeName.IEquals( 'body' ) ) + { + if ( FCK.EditorDocument.body.childNodes.length == 1 + && FCK.EditorDocument.body.firstChild == paddingNode ) + { + var range = FCK.EditorDocument.body.createTextRange() ; + var clearContents = false ; + if ( !paddingNode.childNodes.firstChild ) + { + paddingNode.appendChild( paddingNode.ownerDocument.createTextNode( '\ufeff' ) ) ; + clearContents = true ; + } + range.moveToElementText( paddingNode ) ; + range.select() ; + if ( clearContents ) + range.pasteHTML( '' ) ; + } + } + } } @@ -806,5 +856,4 @@ FCK.InitializeBehaviors() ; - FCK.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ; // Listen for mousedown and mouseup events for tracking drag and drops. Index: /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js (revision 1150) @@ -143,5 +143,6 @@ && node.parentNode != FCK.EditorDocument.documentElement && node == node.parentNode.lastChild - && ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()] ) ) + && ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()] + && ! FCKListsLib.NonEmptyBlockElements[node.parentNode.tagName.toLowerCase()] ) ) node = node.parentNode ; @@ -172,5 +173,6 @@ var stopTag = stopNode.tagName.toLowerCase() ; - if ( FCKListsLib.BlockElements[stopTag] || FCKListsLib.EmptyElements[stopTag] ) + if ( FCKListsLib.BlockElements[stopTag] || FCKListsLib.EmptyElements[stopTag] + || FCKListsLib.NonEmptyBlockElements[stopTag] ) break ; stopNode = stopNode.nextSibling ; @@ -197,26 +199,4 @@ } - this._FillEmptyBlock = function( emptyBlockNode ) - { - if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 ) - return ; - var nodeTag = emptyBlockNode.tagName.toLowerCase() ; - if ( nodeTag != 'p' && nodeTag != 'div' ) - return ; - if ( emptyBlockNode.firstChild ) - return ; - FCKTools.AppendBogusBr( emptyBlockNode ) ; - } - - this._ExecCheckEmptyBlock = function() - { - FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ; - var sel = FCK.EditorWindow.getSelection() ; - if ( !sel || sel.rangeCount < 1 ) - return ; - var range = sel.getRangeAt( 0 ); - FCK._FillEmptyBlock( range.startContainer ) ; - } - this.ExecOnSelectionChangeTimer = function() { @@ -286,6 +266,4 @@ this.EditorDocument.addEventListener( 'click', this._ExecCheckCaret, false ) ; } - if ( FCKBrowserInfo.IsGecko ) - this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ; // Reset the context menu. @@ -451,4 +429,11 @@ var oLink = oLinksInteractor.snapshotItem( i ) ; oLink.href = url ; + + // It may happen that the browser (aka Safari) decides to use the + // URL as the link content to not leave it empty. In this case, + // let's reset it. + if ( sTempUrl == oLink.innerHTML ) + oLink.innerHTML = '' ; + aCreatedLinks.push( oLink ) ; } @@ -457,2 +442,24 @@ return aCreatedLinks ; } + +FCK._FillEmptyBlock = function( emptyBlockNode ) +{ + if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 ) + return ; + var nodeTag = emptyBlockNode.tagName.toLowerCase() ; + if ( nodeTag != 'p' && nodeTag != 'div' ) + return ; + if ( emptyBlockNode.firstChild ) + return ; + FCKTools.AppendBogusBr( emptyBlockNode ) ; +} + +FCK._ExecCheckEmptyBlock = function() +{ + FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ; + var sel = FCK.EditorWindow.getSelection() ; + if ( !sel || sel.rangeCount < 1 ) + return ; + var range = sel.getRangeAt( 0 ); + FCK._FillEmptyBlock( range.startContainer ) ; +} Index: /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js (revision 1150) @@ -93,5 +93,7 @@ function Doc_OnSelectionChange() { - FCK.Events.FireEvent( "OnSelectionChange" ) ; + // Don't fire the event if no document is loaded. + if ( FCK.EditorDocument ) + FCK.Events.FireEvent( "OnSelectionChange" ) ; } @@ -284,6 +286,19 @@ sText = FCKTools.ProcessLineBreaks( window, FCKConfig, sText ) ; + var closeTagIndex = sText.search( '

    ' ) ; + var startTagIndex = sText.search( '

    ' ) ; + + if ( ( closeTagIndex != -1 && startTagIndex != -1 && closeTagIndex < startTagIndex ) + || ( closeTagIndex != -1 && startTagIndex == -1 ) ) + { + var prefix = sText.substr( 0, closeTagIndex ) ; + sText = sText.substr( closeTagIndex + 4 ) ; + this.InsertHtml( prefix ) ; + } + // Insert the resulting data in the editor. + FCKUndo.SaveLocked = true ; this.InsertHtml( sText ) ; + FCKUndo.SaveLocked = false ; } } Index: /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js (revision 1150) @@ -65,6 +65,6 @@ case 'SpecialChar' : oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle , 'dialog/fck_specialchar.html' , 400, 320 ) ; break ; case 'Smiley' : oCommand = new FCKDialogCommand( 'Smiley' , FCKLang.DlgSmileyTitle , 'dialog/fck_smiley.html' , FCKConfig.SmileyWindowWidth, FCKConfig.SmileyWindowHeight ) ; break ; - case 'Table' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html' , 450, 250 ) ; break ; - case 'TableProp' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html?Parent', 400, 250 ) ; break ; + case 'Table' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html' , 480, 250 ) ; break ; + case 'TableProp' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html?Parent', 480, 250 ) ; break ; case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell' , FCKLang.DlgCellTitle , 'dialog/fck_tablecell.html' , 550, 250 ) ; break ; Index: /FCKeditor/releases/latest/editor/_source/internals/fckdialog_ie.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckdialog_ie.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckdialog_ie.js (revision 1150) @@ -38,4 +38,5 @@ try { + dialogInfo.DialogName = dialogName ; oReturn = parentWindow.showModalDialog( pageUrl, dialogInfo, sOptions ) ; } Index: /FCKeditor/releases/latest/editor/_source/internals/fckdocumentprocessor.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckdocumentprocessor.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckdocumentprocessor.js (revision 1150) @@ -128,4 +128,6 @@ */ + var bIsDirty = FCK.IsDirty() ; + var aEmbeds = document.getElementsByTagName( 'EMBED' ) ; @@ -153,4 +155,8 @@ } } + + // Fix the IsDirty state (#1406). + if ( !bIsDirty ) + FCK.ResetIsDirty() ; } Index: /FCKeditor/releases/latest/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckdomtools.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckdomtools.js (revision 1150) @@ -117,5 +117,5 @@ } - if ( !FCKBrowserInfo.IsIE ) + if ( !FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsOpera ) { eChildNode = node.lastChild ; @@ -245,5 +245,5 @@ GetNextSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) { - while( ( currentNode = this.GetNextSourceNode( currentNode, true ) ) ) // Only one "=". + while( ( currentNode = this.GetNextSourceNode( currentNode, false ) ) ) // Only one "=". { if ( currentNode.nodeType == 1 ) @@ -252,6 +252,8 @@ break ; - if ( !ignoreElements || !currentNode.nodeName.IEquals( ignoreElements ) ) - return currentNode ; + if ( ignoreElements && currentNode.nodeName.IEquals( ignoreElements ) ) + return this.GetNextSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ; + + return currentNode ; } else if ( ignoreSpaceTextOnly && currentNode.nodeType == 3 && currentNode.nodeValue.RTrim().length > 0 ) @@ -265,5 +267,5 @@ * Get the next DOM node available in source order. */ - GetNextSourceNode : function( currentNode, startFromSibling, nodeType, stopSearchElement ) + GetNextSourceNode : function( currentNode, startFromSibling, nodeType, stopSearchNode ) { if ( !currentNode ) @@ -276,12 +278,15 @@ else { + if ( stopSearchNode && currentNode == stopSearchNode ) + return null ; + node = currentNode.nextSibling ; - - if ( !node && ( !stopSearchElement || stopSearchElement != currentNode.parentNode ) ) - return this.GetNextSourceNode( currentNode.parentNode, true, nodeType, stopSearchElement ) ; + + if ( !node && ( !stopSearchNode || stopSearchNode != currentNode.parentNode ) ) + return this.GetNextSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ; } if ( nodeType && node && node.nodeType != nodeType ) - return this.GetNextSourceNode( node, false, nodeType, stopSearchElement ) ; + return this.GetNextSourceNode( node, false, nodeType, stopSearchNode ) ; return node ; @@ -291,5 +296,5 @@ * Get the next DOM node available in source order. */ - GetPreviousSourceNode : function( currentNode, startFromSibling, nodeType ) + GetPreviousSourceNode : function( currentNode, startFromSibling, nodeType, stopSearchNode ) { if ( !currentNode ) @@ -301,8 +306,16 @@ node = currentNode.lastChild ; else - node = ( currentNode.previousSibling || this.GetPreviousSourceNode( currentNode.parentNode, true, nodeType ) ) ; + { + if ( stopSearchNode && currentNode == stopSearchNode ) + return null ; + + node = currentNode.previousSibling ; + + if ( !node && ( !stopSearchNode || stopSearchNode != currentNode.parentNode ) ) + return this.GetPreviousSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ; + } if ( nodeType && node && node.nodeType != nodeType ) - return this.GetPreviousSourceNode( node, false, nodeType ) ; + return this.GetPreviousSourceNode( node, false, nodeType, stopSearchNode ) ; return node ; @@ -381,8 +394,27 @@ EnforcePaddingNode : function( doc, tagName ) { + // In IE it can happen when the page is reloaded that doc or doc.body is null, so exit here + try + { + if ( !doc || !doc.body ) + return ; + } + catch (e) + { + return ; + } + this.CheckAndRemovePaddingNode( doc, tagName, true ) ; - if ( doc.body.lastChild && ( doc.body.lastChild.nodeType != 1 - || doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() ) ) + try + { + if ( doc.body.lastChild && ( doc.body.lastChild.nodeType != 1 + || doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() ) ) + return ; + } + catch (e) + { return ; + } + var node = doc.createElement( tagName ) ; if ( FCKBrowserInfo.IsGecko && FCKListsLib.NonEmptyBlockElements[ tagName ] ) @@ -406,12 +438,20 @@ // If the padding node is changed, remove its status as a padding node. - if ( paddingNode.parentNode != doc.body - || paddingNode.tagName.toLowerCase() != tagName - || ( paddingNode.childNodes.length > 1 ) - || ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0' - && String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) ) - { - this.PaddingNode = null ; - return ; + try + { + if ( paddingNode.parentNode != doc.body + || paddingNode.tagName.toLowerCase() != tagName + || ( paddingNode.childNodes.length > 1 ) + || ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0' + && String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) ) + { + this.PaddingNode = null ; + return ; + } + } + catch (e) + { + this.PaddingNode = null ; + return ; } @@ -448,5 +488,5 @@ if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' ) { - // IE has a strange bug. If calling removeAttribute('className'), + // IE has a strange bug. If calling removeAttribute('className'), // the attributes collection will still contain the "class" // attribute, which will be marked as "specified", even if the @@ -574,7 +614,7 @@ { var candidate = parentNode.childNodes[i] ; - if ( normalized === true && - candidate.nodeType == 3 && - candidate.previousSibling && + if ( normalized === true && + candidate.nodeType == 3 && + candidate.previousSibling && candidate.previousSibling.nodeType == 3 ) continue; @@ -769,5 +809,5 @@ if ( currentListItem.nodeType == 11 ) { - if ( currentListItem.lastChild && + if ( currentListItem.lastChild && currentListItem.lastChild.getAttribute && currentListItem.lastChild.getAttribute( 'type' ) == '_moz' ) @@ -843,5 +883,5 @@ return node ; }, - + /** * Checks if an element has no "useful" content inside of it @@ -855,5 +895,5 @@ var child = element.firstChild ; var elementChild ; - + while ( child ) { @@ -862,5 +902,5 @@ if ( elementChild || !FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] ) return false ; - + if ( !elementCheckCallback || elementCheckCallback( child ) === true ) elementChild = child ; @@ -868,8 +908,8 @@ else if ( child.nodeType == 3 && child.nodeValue.length > 0 ) return false ; - + child = child.nextSibling ; } - + return elementChild ? this.CheckIsEmptyElement( elementChild, elementCheckCallback ) : true ; }, @@ -880,4 +920,60 @@ for ( var styleName in styleDict ) style[ styleName ] = styleDict[ styleName ] ; + }, + + GetCurrentElementStyle : function( w, element, attrName ) + { + if ( FCKBrowserInfo.IsIE ) + return element.currentStyle[attrName] ; + else + return w.getComputedStyle( element, '' )[attrName] ; + }, + + GetPositionedAncestor : function( w, element ) + { + var currentElement = element ; + while ( currentElement != currentElement.ownerDocument.documentElement ) + { + if ( this.GetCurrentElementStyle( w, currentElement, 'position' ) != 'static' ) + return currentElement ; + currentElement = currentElement.parentNode ; + } + return null ; + }, + + /** + * Current implementation for ScrollIntoView (due to #1462). We don't have + * a complete implementation here, just the things that fit our needs. + */ + ScrollIntoView : function( element, alignTop ) + { + // Get the element window. + var window = FCKTools.GetElementWindow( element ) ; + var windowHeight = FCKTools.GetViewPaneSize( window ).Height ; + + // Starts the offset that will be scrolled with the negative value of + // the visible window height. + var offset = windowHeight * -1 ; + + // Appends the height it we are about to align the bottoms. + if ( alignTop === false ) + { + offset += element.offsetHeight ; + + // Consider the margin in the scroll, which is ok for our current + // needs, but needs investigation if we will be using this function + // in other places. + offset += parseInt( this.GetCurrentElementStyle( window, element, 'marginBottom' ) || 0, 10 ) ; + } + + // Appends the offsets for the entire element hierarchy. + offset += element.offsetTop ; + while ( ( element = element.offsetParent ) ) + offset += element.offsetTop || 0 ; + + // Scroll the window to the desired position, if not already visible. + var currentScroll = FCKTools.GetScrollPosition( window ).Y ; + if ( offset > 0 && offset > currentScroll ) + window.scrollTo( 0, offset ) ; } } ; Index: /FCKeditor/releases/latest/editor/_source/internals/fckregexlib.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckregexlib.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckregexlib.js (revision 1150) @@ -75,4 +75,5 @@ ProtectUrlsImg : /]+))/gi , ProtectUrlsA : /]+))/gi , +ProtectUrlsArea : /]+))/gi , Html4DocType : /HTML 4\.0 Transitional/i , Index: /FCKeditor/releases/latest/editor/_source/internals/fckselection_gecko.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckselection_gecko.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckselection_gecko.js (revision 1150) @@ -58,16 +58,19 @@ if ( selection && selection.anchorNode && selection.anchorNode.nodeType == 1 ) { - // This one is good for all browsers, expect Safari Mac. - selectedElement = selection.anchorNode.childNodes[ selection.anchorOffset ] ; - - // For Safari (Mac only), the anchor node for a control selection is - // the control itself, which seams logic. FF and Opera use the parent - // as the anchor node, pointing to the control with the offset. - // As FF created the selection "standard", Safari would do better by - // following their steps. - if ( !selectedElement ) - selectedElement = selection.anchorNode ; - else if ( selectedElement.nodeType != 1 ) - return null ; + if ( this.GetType() == 'Control' ) + { + // This one is good for all browsers, expect Safari Mac. + selectedElement = selection.anchorNode.childNodes[ selection.anchorOffset ] ; + + // For Safari (Mac only), the anchor node for a control selection is + // the control itself, which seams logic. FF and Opera use the parent + // as the anchor node, pointing to the control with the offset. + // As FF created the selection "standard", Safari would do better by + // following their steps. + if ( !selectedElement ) + selectedElement = selection.anchorNode ; + else if ( selectedElement.nodeType != 1 ) + return null ; + } } Index: /FCKeditor/releases/latest/editor/_source/internals/fckstyles.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckstyles.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckstyles.js (revision 1150) @@ -38,5 +38,5 @@ else style.ApplyToSelection( FCK.EditorWindow ) ; - + FCK.Events.FireEvent( 'OnSelectionChange' ) ; } @@ -219,5 +219,5 @@ FCK.Events.FireEvent( 'OnSelectionChange' ) ; }, - + GetStyle : function( styleName ) { @@ -230,5 +230,5 @@ if ( !styles ) { - styles = this._GetStyles = FCKTools.Merge( + styles = this._GetStyles = FCKTools.Merge( this._LoadStylesCore(), this._LoadStylesCustom(), @@ -237,5 +237,5 @@ return styles ; }, - + CheckHasObjectStyle : function( elementName ) { @@ -265,5 +265,8 @@ { for ( var styleName in styleDefs ) - styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ; + { + var style = styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ; + style.Name = styleName ; + } } @@ -283,9 +286,13 @@ var xml = new FCKXml() ; xml.LoadUrl( stylesXmlPath ) ; - + var stylesXmlObj = FCKXml.TransformToObject( xml.SelectSingleNode( 'Styles' ) ) ; // Get the "Style" nodes defined in the XML file. var styleNodes = stylesXmlObj.$Style ; + + // Check that it did contain some valid nodes + if ( !styleNodes ) + return styles ; // Add each style to our "Styles" collection. @@ -326,14 +333,14 @@ // Load override definitions. var cssStyleOverrideNodes = styleNode.$Override ; - if ( cssStyleOverrideNodes ) + if ( cssStyleOverrideNodes ) { for ( j = 0 ; j < cssStyleOverrideNodes.length ; j++ ) { var overrideNode = cssStyleOverrideNodes[j] ; - var overrideDef = + var overrideDef = { Element : overrideNode.element } ; - + var overrideAttNode = overrideNode.$Attribute ; if ( overrideAttNode ) @@ -353,5 +360,5 @@ } } - + styleDef.Overrides.push( overrideDef ) ; } @@ -360,5 +367,5 @@ var style = new FCKStyle( styleDef ) ; style.Name = styleNode.name || element ; - + if ( style.GetType() == FCK_STYLE_OBJECT ) this._ObjectStyles[ element ] = true ; Index: /FCKeditor/releases/latest/editor/_source/internals/fcktoolbarset.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fcktoolbarset.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fcktoolbarset.js (revision 1150) @@ -91,5 +91,5 @@ // Initialize the IFRAME document body. eTargetDocument.open() ; - eTargetDocument.write( '' + sBase + '' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; + eTargetDocument.write( '' + sBase + '' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; eTargetDocument.close() ; Index: /FCKeditor/releases/latest/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fcktools.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fcktools.js (revision 1150) @@ -79,5 +79,6 @@ FCKTools.FixDocumentParentWindow = function( targetWindow ) { - targetWindow.document.parentWindow = targetWindow ; + if ( targetWindow.document ) + targetWindow.document.parentWindow = targetWindow ; for ( var i = 0 ; i < targetWindow.frames.length ; i++ ) @@ -423,10 +424,50 @@ var y = 0 ; var curNode = node ; - while ( curNode && curNode != w.document.body ) + var prevNode = null ; + var curWindow = FCKTools.GetElementWindow( curNode ) ; + while ( curNode && !( curWindow == w && ( curNode == w.document.body || curNode == w.document.documentElement ) ) ) { x += curNode.offsetLeft - curNode.scrollLeft ; y += curNode.offsetTop - curNode.scrollTop ; - curNode = curNode.offsetParent ; - } + + if ( ! FCKBrowserInfo.IsOpera ) + { + var scrollNode = prevNode ; + while ( scrollNode && scrollNode != curNode ) + { + x -= scrollNode.scrollLeft ; + y -= scrollNode.scrollTop ; + scrollNode = scrollNode.parentNode ; + } + } + + prevNode = curNode ; + if ( curNode.offsetParent ) + curNode = curNode.offsetParent ; + else + { + if ( curWindow != w ) + { + curNode = curWindow.frameElement ; + prevNode = null ; + if ( curNode ) + curWindow = FCKTools.GetElementWindow( curNode ) ; + } + else + curNode = null ; + } + } + + // document.body is a special case when it comes to offsetTop and offsetLeft values. + // 1. It matters if document.body itself is a positioned element; + // 2. It matters is when we're in IE and the element has no positioned ancestor. + // Otherwise the values should be ignored. + if ( FCKDomTools.GetCurrentElementStyle( w, w.document.body, 'position') != 'static' + || ( FCKBrowserInfo.IsIE && FCKDomTools.GetPositionedAncestor( w, node ) == null ) ) + { + x += w.document.body.offsetLeft ; + y += w.document.body.offsetTop ; + } + return { "x" : x, "y" : y } ; } Index: /FCKeditor/releases/latest/editor/_source/internals/fckundo.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckundo.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckundo.js (revision 1150) @@ -28,4 +28,5 @@ FCKUndo.MaxTypes = 25 ; FCKUndo.Typing = false ; +FCKUndo.SaveLocked = false ; FCKUndo._GetBookmark = function() @@ -115,5 +116,5 @@ FCKUndo.SaveUndoStep = function() { - if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) + if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || this.SaveLocked ) return ; Index: /FCKeditor/releases/latest/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/internals/fckxhtml.js (revision 1149) +++ /FCKeditor/releases/latest/editor/_source/internals/fckxhtml.js (revision 1150) @@ -199,5 +199,6 @@ // Ignore bogus BR nodes in the DOM. - if ( FCKBrowserInfo.IsGecko && + if ( FCKBrowserInfo.IsGecko && + htmlNode.nextSibling && ( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) ) return false ; @@ -313,4 +314,81 @@ FCKXHtml.TagProcessors = { + 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 ) + FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ; + + + // Anchors with content has been marked with an additional class, now we must remove it. + if ( FCKBrowserInfo.IsIE ) + { + // Buggy IE, doesn't copy the name of changed anchors. + if ( htmlNode.name ) + FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; + } + + node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; + + return node ; + }, + + area : function( node, htmlNode ) + { + var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ; + if ( sSavedUrl != null ) + FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ; + + // IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually. + if ( FCKBrowserInfo.IsIE ) + { + if ( ! node.attributes.getNamedItem( 'coords' ) ) + { + var sCoords = htmlNode.getAttribute( 'coords', 2 ) ; + if ( sCoords && sCoords != '0,0,0' ) + FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ; + } + + if ( ! node.attributes.getNamedItem( 'shape' ) ) + { + var sShape = htmlNode.getAttribute( 'shape', 2 ) ; + if ( sShape && sShape.length > 0 ) + FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ; + } + } + + return node ; + }, + + body : function( node, htmlNode ) + { + node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; + // Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351). + node.removeAttribute( 'spellcheck' ) ; + return node ; + }, + + // IE loses contents of iframes, and Gecko does give it back HtmlEncoded + // Note: Opera does lose the content and doesn't provide it in the innerHTML string + iframe : function( node, htmlNode ) + { + var sHtml = htmlNode.innerHTML ; + + // Gecko does give back the encoded html + if ( FCKBrowserInfo.IsGecko ) + sHtml = FCKTools.HTMLDecode( sHtml ); + + // Remove the saved urls here as the data won't be processed as nodes + sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ; + + node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ; + + return node ; + }, + img : function( node, htmlNode ) { @@ -326,24 +404,35 @@ }, - 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 ) + // Fix nested