+ Reduced TC for #1462 (second + attempt).
++ This page should have the IFRAME scrolled down, so the blinking caret position is + visible. The selection position should be always visible, even when set by code. + Only IE supports it.
++ Just load this page. The caret position will not be visible until you start typing.
+Reduced TC for #1462.
+Scroll down the page until the IFRAME and the button are visible.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+ ++ The above IFRAME constains a yellow and a red DIV elements. By clicking the + following button, only the IFRAME should scroll to show the red DIV, + while the main window should stay at the same position. +
++ +
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+Some text.
+ + Index: /FCKeditor/branches/versions/2.5.x/_samples/html/sample03.html =================================================================== --- /FCKeditor/branches/versions/2.5.x/_samples/html/sample03.html (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/_samples/html/sample03.html (revision 1147) @@ -39,4 +39,7 @@ var oCombo = document.getElementById( 'cmbLanguages' ) ; + + // Remove all options. (#1399) + oCombo.innerHTML = '' ; var aLanguages = new Array() ; Index: /FCKeditor/branches/versions/2.5.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.5.x/_whatsnew.html (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/_whatsnew.html (revision 1147) @@ -22,14 +22,131 @@ -+ New Features and Improvements:
++ Fixed Bugs:
+New Features and Improvements:
@@ -68,16 +185,16 @@ the "Remove All" button, by using the "RemoveFormatTags" setting. -Index: /FCKeditor/branches/versions/2.5.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.5.x/_whatsnew_history.html (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/_whatsnew_history.html (revision 1147) @@ -22,12 +22,15 @@
-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 ) @@ -595,5 +617,5 @@ var startOk = false ; var endOk = false ; - + /* FCKDebug.Output( 'sc='+range.StartContainer.nodeName+ Index: /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckevents.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckevents.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckevents.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/classes/fckmenublock.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckmenublock.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckmenublock.js (revision 1147) @@ -96,4 +96,7 @@ function FCKMenuBlock_Item_OnClick( clickedItem, menuBlock ) { + if ( menuBlock.Hide ) + menuBlock.Hide() ; + FCKTools.RunFunction( menuBlock.OnClick, menuBlock, [ clickedItem ] ) ; } Index: /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckpanel.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckpanel.js (revision 1147) @@ -169,5 +169,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, @@ -191,15 +201,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 ) @@ -243,4 +262,6 @@ // Move the focus to the IFRAME so we catch the "onblur". this._IFrame.contentWindow.focus() ; + + FCKPanel._OpenedPanel = this ; } @@ -256,5 +277,5 @@ else { - if ( !this._IsOpened ) + if ( !this._IsOpened || this._LockCounter > 0 ) return ; Index: /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckspecialcombo.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckspecialcombo.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckspecialcombo.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/classes/fckstyle.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckstyle.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fckstyle.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/classes/fcktoolbarbuttonui.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fcktoolbarbuttonui.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/classes/fcktoolbarbuttonui.js (revision 1147) @@ -128,4 +128,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/branches/versions/2.5.x/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fck_othercommands.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fck_othercommands.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/commandclasses/fckblockquotecommand.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fckblockquotecommand.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fckblockquotecommand.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/commandclasses/fckshowblocks.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fckshowblocks.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fckshowblocks.js (revision 1147) @@ -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/branches/versions/2.5.x/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1146) +++ /FCKeditor/branches/versions/2.5.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1147) @@ -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 = '' ) ;
+
+ 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/branches/versions/2.5.x/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckcommands.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckcommands.js (revision 1147)
@@ -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/branches/versions/2.5.x/editor/_source/internals/fckdialog_ie.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdialog_ie.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdialog_ie.js (revision 1147)
@@ -38,4 +38,5 @@
try
{
+ dialogInfo.DialogName = dialogName ;
oReturn = parentWindow.showModalDialog( pageUrl, dialogInfo, sOptions ) ;
}
Index: /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdocumentprocessor.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdocumentprocessor.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdocumentprocessor.js (revision 1147)
@@ -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/branches/versions/2.5.x/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdomtools.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckdomtools.js (revision 1147)
@@ -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/branches/versions/2.5.x/editor/_source/internals/fckregexlib.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckregexlib.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckregexlib.js (revision 1147)
@@ -75,4 +75,5 @@
ProtectUrlsImg : / and
.
+ ol : function( node, htmlNode, targetNode )
+ {
+ if ( htmlNode.innerHTML.Trim().length == 0 )
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 ) ;
+ var ePSibling = targetNode.lastChild ;
+
+ if ( ePSibling && ePSibling.nodeType == 3 )
+ ePSibling = ePSibling.previousSibling ;
+
+ if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' )
+ {
+ htmlNode._fckxhtmljob = null ;
+ FCKXHtml._AppendNode( ePSibling, htmlNode ) ;
+ return false ;
+ }
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+ return node ;
+ },
+
+ pre : function ( node, htmlNode )
+ {
+ var firstChild = htmlNode.firstChild ;
+
+ if ( firstChild && firstChild.nodeType == 3 )
+ node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
+
+ FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
return node ;
@@ -361,4 +450,15 @@
},
+ span : function( node, htmlNode )
+ {
+ // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1084404).
+ if ( htmlNode.innerHTML.length == 0 )
+ return false ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+
+ return node ;
+ },
+
style : function( node, htmlNode )
{
@@ -376,23 +476,4 @@
},
- pre : function ( node, htmlNode )
- {
- for ( var i = 0 ; i < htmlNode.childNodes.length ; i++ )
- {
- var item = htmlNode.childNodes[i] ;
- var val = item.nodeValue ;
- if ( item.nodeType == 3 && i == 0 )
- {
- // We shouldn't put the plain text value of the text node directly into HTML. (See #1414)
- var dummyNode = document.createElement( 'pre' ) ;
- dummyNode.appendChild( document.createTextNode( val ) ) ;
- node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' + dummyNode.innerHTML ) ) ) ;
- }
- else
- FCKXHtml._AppendNode( node, item ) ;
- }
- return node ;
- },
-
title : function( node, htmlNode )
{
@@ -400,64 +481,4 @@
return node ;
- },
-
- // Fix nested
and
.
- ol : function( node, htmlNode, targetNode )
- {
- if ( htmlNode.innerHTML.Trim().length == 0 )
- return false ;
-
- var ePSibling = targetNode.lastChild ;
-
- if ( ePSibling && ePSibling.nodeType == 3 )
- ePSibling = ePSibling.previousSibling ;
-
- if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' )
- {
- htmlNode._fckxhtmljob = null ;
- FCKXHtml._AppendNode( ePSibling, htmlNode ) ;
- return false ;
- }
-
- node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
-
- return node ;
- },
-
- span : function( node, htmlNode )
- {
- // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1084404).
- if ( htmlNode.innerHTML.length == 0 )
- return false ;
-
- node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
-
- 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 ;
- },
-
- 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 ;
}
} ;
Index: /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckxhtml_ie.js
===================================================================
--- /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckxhtml_ie.js (revision 1146)
+++ /FCKeditor/branches/versions/2.5.x/editor/_source/internals/fckxhtml_ie.js (revision 1147)
@@ -83,4 +83,83 @@
}
+// On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
+FCKXHtml.TagProcessors['div'] = function( node, htmlNode )
+{
+ if ( htmlNode.align.length > 0 )
+ FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+ return node ;
+}
+
+// IE automatically changes tags to .
+FCKXHtml.TagProcessors['font'] = function( node, htmlNode )
+{
+ if ( node.attributes.length == 0 )
+ node = FCKXHtml.XML.createDocumentFragment() ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+ return node ;
+}
+
+FCKXHtml.TagProcessors['form'] = function( node, htmlNode )
+{
+ if ( htmlNode.acceptCharset && htmlNode.acceptCharset.length > 0 && htmlNode.acceptCharset != 'UNKNOWN' )
+ FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ;
+
+ // IE has a bug and htmlNode.attributes['name'].specified=false if there is
+ // no element with id="name" inside the form (#360 and SF-BUG-1155726).
+ var nameAtt = htmlNode.attributes['name'] ;
+
+ if ( nameAtt && nameAtt.value.length > 0 )
+ FCKXHtml._AppendAttribute( node, 'name', nameAtt.value ) ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+ return node ;
+}
+
+// IE doens't see the value attribute as an attribute for the tag.
+FCKXHtml.TagProcessors['input'] = function( node, htmlNode )
+{
+ if ( htmlNode.name )
+ FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+
+ if ( htmlNode.value && !node.attributes.getNamedItem( 'value' ) )
+ FCKXHtml._AppendAttribute( node, 'value', htmlNode.value ) ;
+
+ if ( !node.attributes.getNamedItem( 'type' ) )
+ FCKXHtml._AppendAttribute( node, 'type', 'text' ) ;
+
+ return node ;
+}
+
+FCKXHtml.TagProcessors['label'] = function( node, htmlNode )
+{
+ if ( htmlNode.htmlFor.length > 0 )
+ FCKXHtml._AppendAttribute( node, 'for', htmlNode.htmlFor ) ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+ return node ;
+}
+
+// Fix behavior for IE, it doesn't read back the .name on newly created maps
+FCKXHtml.TagProcessors['map'] = function( node, htmlNode )
+{
+ if ( ! node.attributes.getNamedItem( 'name' ) )
+ {
+ var name = htmlNode.name ;
+ if ( name )
+ FCKXHtml._AppendAttribute( node, 'name', name ) ;
+ }
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+ return node ;
+}
+
FCKXHtml.TagProcessors['meta'] = function( node, htmlNode )
{
@@ -102,107 +181,23 @@
}
-// IE automatically changes tags to .
-FCKXHtml.TagProcessors['font'] = function( node, htmlNode )
-{
- if ( node.attributes.length == 0 )
- node = FCKXHtml.XML.createDocumentFragment() ;
-
- node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
-
- return node ;
-}
-
-// IE doens't see the value attribute as an attribute for the tag.
-FCKXHtml.TagProcessors['input'] = function( node, htmlNode )
+// IE ignores the "SELECTED" attribute so we must add it manually.
+FCKXHtml.TagProcessors['option'] = function( node, htmlNode )
+{
+ if ( htmlNode.selected && !node.attributes.getNamedItem( 'selected' ) )
+ FCKXHtml._AppendAttribute( node, 'selected', 'selected' ) ;
+
+ node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+ return node ;
+}
+
+// IE doens't hold the name attribute as an attribute for the