Fixed Bugs:
Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckcontextmenu.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckcontextmenu.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckcontextmenu.js (revision 2229)
@@ -91,4 +91,7 @@
function FCKContextMenu_Document_OnContextMenu( e )
{
+ if ( FCKConfig.BrowserContextMenu )
+ return true ;
+
var el = e.target ;
@@ -115,4 +118,7 @@
if( !e || e.button != 2 )
return false ;
+
+ if ( FCKConfig.BrowserContextMenu )
+ return true ;
var el = e.target ;
@@ -147,4 +153,7 @@
function FCKContextMenu_Document_OnMouseUp( e )
{
+ if ( FCKConfig.BrowserContextMenu )
+ return true ;
+
var overrideButton = FCKContextMenu_OverrideButton ;
@@ -166,5 +175,5 @@
function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
{
- if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) )
+ if ( ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) || FCKConfig.BrowserContextMenu )
return true ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js (revision 2229)
@@ -43,5 +43,4 @@
// For text nodes, the node itself is the StartNode.
var eStart = innerRange.startContainer ;
- var eEnd = innerRange.endContainer ;
var oElementPath = new FCKElementPath( eStart ) ;
@@ -51,26 +50,38 @@
this.StartBlockLimit = oElementPath.BlockLimit ;
- if ( eStart != eEnd )
- oElementPath = new FCKElementPath( eEnd ) ;
-
- // The innerRange.endContainer[ innerRange.endOffset ] is not
- // usually part of the range, but the marker for the range end. So,
- // let's get the previous available node as the real end.
- var eEndNode = eEnd ;
- if ( innerRange.endOffset == 0 )
+ if ( innerRange.collapsed )
{
- while ( eEndNode && !eEndNode.previousSibling )
- eEndNode = eEndNode.parentNode ;
-
- if ( eEndNode )
- eEndNode = eEndNode.previousSibling ;
+ this.EndNode = this.StartNode ;
+ this.EndContainer = this.StartContainer ;
+ this.EndBlock = this.StartBlock ;
+ this.EndBlockLimit = this.StartBlockLimit ;
}
- else if ( eEndNode.nodeType == 1 )
- eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
-
- this.EndNode = eEndNode ;
- this.EndContainer = eEnd ;
- this.EndBlock = oElementPath.Block ;
- this.EndBlockLimit = oElementPath.BlockLimit ;
+ else
+ {
+ var eEnd = innerRange.endContainer ;
+
+ if ( eStart != eEnd )
+ oElementPath = new FCKElementPath( eEnd ) ;
+
+ // The innerRange.endContainer[ innerRange.endOffset ] is not
+ // usually part of the range, but the marker for the range end. So,
+ // let's get the previous available node as the real end.
+ var eEndNode = eEnd ;
+ if ( innerRange.endOffset == 0 )
+ {
+ while ( eEndNode && !eEndNode.previousSibling )
+ eEndNode = eEndNode.parentNode ;
+
+ if ( eEndNode )
+ eEndNode = eEndNode.previousSibling ;
+ }
+ else if ( eEndNode.nodeType == 1 )
+ eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
+
+ this.EndNode = eEndNode ;
+ this.EndContainer = eEnd ;
+ this.EndBlock = oElementPath.Block ;
+ this.EndBlockLimit = oElementPath.BlockLimit ;
+ }
}
Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js (revision 2229)
@@ -620,8 +620,5 @@
eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ;
- if ( FCKBrowserInfo.IsSafari )
- FCKDomTools.ScrollIntoView( dummy, false ) ;
- else
- dummy.scrollIntoView( false ) ;
+ FCKDomTools.ScrollIntoView( dummy, false ) ;
dummy.parentNode.removeChild( dummy ) ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckstyle.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckstyle.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckstyle.js (revision 2229)
@@ -222,4 +222,6 @@
continue ;
+ /*jsl:fallthru*/
+
default :
FCKDomTools.RemoveAttribute( pathElement, att ) ;
@@ -374,4 +376,6 @@
continue ;
+ /*jsl:fallthru*/
+
default :
FCKDomTools.RemoveAttribute( currentNode, att ) ;
@@ -547,4 +551,6 @@
continue ;
+ /*jsl:fallthru*/
+
default :
FCKDomTools.RemoveAttribute( innerElement, att ) ;
@@ -782,5 +788,5 @@
if ( !isTag )
{
- value = value.replace( /\n/g, ' to
' ) ;
+ value = value.replace( /\n/g, '
' ) ;
value = value.replace( /[ \t]{2,}/g,
function ( match )
@@ -803,11 +809,15 @@
var innerHTML = block.innerHTML.Trim() ;
- // 1. Delete ANSI whitespaces immediately before and after
because they are not visible.
- // 2. Mark down any
nodes here so they can be turned into \n in the next step and avoid being compressed.
- innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ;
-
- // 3. Compress other ANSI whitespaces since they're only visible as one single space previously.
+ // 1. Delete ANSI whitespaces immediately before and after
because
+ // they are not visible.
+ // 2. Mark down any
nodes here so they can be turned into \n in
+ // the next step and avoid being compressed.
+ innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ;
+
+ // 3. Compress other ANSI whitespaces since they're only visible as one
+ // single space previously.
// 4. Convert to spaces since is no longer needed in .
- // 5. Convert any
to \n. This must not be done earlier because the \n would then get compressed.
+ // 5. Convert any
to \n. This must not be done earlier because
+ // the \n would then get compressed.
var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
var results = [] ;
@@ -816,12 +826,14 @@
if ( !isTag )
value = value.replace( /([ \t\n\r]+| )/g, ' ' ) ;
- else if ( isTag && value == '
' )
+ else if ( isTag && value == '
' )
value = '\n' ;
results.push( value ) ;
} ) ;
- // Assigning innerHTML to in IE causes all linebreaks to be reduced to spaces.
- // Assigning outerHTML to
in IE doesn't work if the
isn't contained in another node
- // since the node reference is changed after outerHTML assignment.
+ // Assigning innerHTML to
in IE causes all linebreaks to be
+ // reduced to spaces.
+ // Assigning outerHTML to
in IE doesn't work if the
isn't
+ // contained in another node since the node reference is changed after
+ // outerHTML assignment.
// So, we need some hacks to workaround IE bugs here.
if ( FCKBrowserInfo.IsIE )
@@ -829,10 +841,90 @@
var temp = doc.createElement( 'div' ) ;
temp.appendChild( newBlock ) ;
- newBlock.outerHTML = '
\n' + results.join( '' ) + '
' ;
+ newBlock.outerHTML = '\n' + results.join( '' ) + '
' ;
newBlock = temp.removeChild( temp.firstChild ) ;
}
else
newBlock.innerHTML = results.join( '' ) ;
+
return newBlock ;
+ },
+
+ /**
+ * Merge a block with a previous
block, if available.
+ */
+ _CheckAndMergePre : function( previousBlock, preBlock )
+ {
+ // Check if the previous block and the current block are next
+ // to each other.
+ if ( previousBlock != FCKDomTools.GetPreviousSourceElement( preBlock, true ) )
+ return ;
+
+ // Merge the previous block contents into the current
+ // block.
+ //
+ // Another thing to be careful here is that currentBlock might contain
+ // a '\n' at the beginning, and previousBlock might contain a '\n'
+ // towards the end. These new lines are not normally displayed but they
+ // become visible after merging.
+ var innerHTML = previousBlock.innerHTML.replace( /\n$/, '' ) + '\n\n' +
+ preBlock.innerHTML.replace( /^\n/, '' ) ;
+
+ // Buggy IE normalizes innerHTML from
, breaking whitespaces.
+ if ( FCKBrowserInfo.IsIE )
+ preBlock.outerHTML = '
' + innerHTML + '
' ;
+ else
+ preBlock.innerHTML = innerHTML ;
+
+ // Remove the previous block.
+ //
+ // The preBlock must not be moved or deleted from the DOM tree. This
+ // guarantees the FCKDomRangeIterator in _ApplyBlockStyle would not
+ // get lost at the next iteration.
+ FCKDomTools.RemoveNode( previousBlock ) ;
+ },
+
+ _CheckAndSplitPre : function( newBlock )
+ {
+ var lastNewBlock ;
+
+ var cursor = newBlock.firstChild ;
+
+ // We are not splitting
at the beginning of the block, so
+ // we'll start from the second child.
+ cursor = cursor && cursor.nextSibling ;
+
+ while ( cursor )
+ {
+ var next = cursor.nextSibling ;
+
+ // If we have two
s, and they're not at the beginning or the end,
+ // then we'll split up the contents following them into another block.
+ // Stop processing if we are at the last child couple.
+ if ( next && next.nextSibling && cursor.nodeName.IEquals( 'br' ) && next.nodeName.IEquals( 'br' ) )
+ {
+ // Remove the first
.
+ FCKDomTools.RemoveNode( cursor ) ;
+
+ // Move to the node after the second
.
+ cursor = next.nextSibling ;
+
+ // Remove the second
.
+ FCKDomTools.RemoveNode( next ) ;
+
+ // Create the block that will hold the child nodes from now on.
+ lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || newBlock, FCKDomTools.CloneElement( newBlock ) ) ;
+
+ continue ;
+ }
+
+ // If we split it, then start moving the nodes to the new block.
+ if ( lastNewBlock )
+ {
+ cursor = cursor.previousSibling ;
+ FCKDomTools.MoveNode(cursor.nextSibling, lastNewBlock ) ;
+ }
+
+ cursor = cursor.nextSibling ;
+ }
},
@@ -857,7 +949,5 @@
var block ;
var doc = range.Window.document ;
-
- var preBlocks = [] ;
- var convertedPreBlocks = [] ;
+ var previousPreBlock ;
while( ( block = iterator.GetNextParagraph() ) ) // Only one =
@@ -866,17 +956,16 @@
var newBlock = this.BuildElement( doc ) ;
+ // Check if we are changing from/to .
+ var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
+ var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
+
+ var toPre = newBlockIsPre && !blockIsPre ;
+ var fromPre = !newBlockIsPre && blockIsPre ;
+
// Move everything from the current node to the new one.
- var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
- var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
- if ( newBlockIsPre && !blockIsPre )
- {
+ if ( toPre )
newBlock = this._ToPre( doc, block, newBlock ) ;
- preBlocks.push( newBlock ) ;
- }
- else if ( !newBlockIsPre && blockIsPre )
- {
+ else if ( fromPre )
newBlock = this._FromPre( doc, block, newBlock ) ;
- convertedPreBlocks.push( newBlock ) ;
- }
else // Convering from a regular block to another regular block.
FCKDomTools.MoveChildren( block, newBlock ) ;
@@ -885,46 +974,14 @@
block.parentNode.insertBefore( newBlock, block ) ;
FCKDomTools.RemoveNode( block ) ;
- }
-
- // Merge adjacent blocks for #1229.
- for ( var i = 0 ; i < preBlocks.length - 1 ; i++ )
- {
- // Check if the next block in HTML equals the next block generated.
- if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] )
- continue ;
-
- // Merge the upper
block's content into the lower
block.
- // Remove the upper
block.
- preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ;
- FCKDomTools.RemoveNode( preBlocks[i] ) ;
- }
-
- // Split converted
blocks for #1229.
- for ( var i = 0 ; i < convertedPreBlocks.length ; i++ )
- {
- var currentBlock = convertedPreBlocks[i] ;
- var lastNewBlock = null ;
- for ( var j = 0 ; j < currentBlock.childNodes.length ; j++ )
- {
- var cursor = currentBlock.childNodes[j] ;
-
- // If we have two
s, and they're not at the beginning or the end,
- // then we'll split up the contents following them into another block.
- if ( cursor.nodeName.IEquals( 'br' ) && j != 0 && j != currentBlock.childNodes.length - 2
- && cursor.nextSibling && cursor.nextSibling.nodeName.IEquals( 'br' ) )
- {
- FCKDomTools.RemoveNode( cursor.nextSibling ) ;
- FCKDomTools.RemoveNode( cursor ) ;
- j-- ; // restart at current index at next iteration
- lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || currentBlock, doc.createElement( currentBlock.nodeName ) ) ;
- continue ;
- }
-
- if ( lastNewBlock )
- {
- FCKDomTools.MoveNode( cursor, lastNewBlock ) ;
- j-- ; // restart at current index at next iteration
- }
- }
+
+ // Complete other tasks after inserting the node in the DOM.
+ if ( newBlockIsPre )
+ {
+ if ( previousPreBlock )
+ this._CheckAndMergePre( previousPreBlock, newBlock ) ; // Merge successive blocks.
+ previousPreBlock = newBlock ;
+ }
+ else if ( fromPre )
+ this._CheckAndSplitPre( newBlock ) ; // Split
in successive s.
}
Index: /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fck_othercommands.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fck_othercommands.js (revision 2229)
@@ -312,4 +312,63 @@
}
+FCKVisitLinkCommand = function()
+{
+ this.Name = 'VisitLink';
+}
+FCKVisitLinkCommand.prototype =
+{
+ GetState : function()
+ {
+ if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ return FCK_TRISTATE_DISABLED ;
+ var state = FCK.GetNamedCommandState( 'Unlink' ) ;
+
+ if ( state == FCK_TRISTATE_OFF )
+ {
+ var el = FCKSelection.MoveToAncestorNode( 'A' ) ;
+ if ( !el.href )
+ state = FCK_TRISTATE_DISABLED ;
+ }
+
+ return state ;
+ },
+
+ Execute : function()
+ {
+ var el = FCKSelection.MoveToAncestorNode( 'A' ) ;
+ var url = el.getAttribute( '_fcksavedurl' ) || el.getAttribute( 'href', 2 ) ;
+
+ // Check if it's a full URL.
+ // If not full URL, we'll need to apply the BaseHref setting.
+ if ( ! /:\/\//.test( url ) )
+ {
+ var baseHref = FCKConfig.BaseHref ;
+ var parentWindow = FCK.GetInstanceObject( 'parent' ) ;
+ if ( !baseHref )
+ {
+ baseHref = parentWindow.document.location.href ;
+ baseHref = baseHref.substring( 0, baseHref.lastIndexOf( '/' ) + 1 ) ;
+ }
+
+ if ( /^\//.test( url ) )
+ {
+ try
+ {
+ baseHref = baseHref.match( /^.*:\/\/+[^\/]+/ )[0] ;
+ }
+ catch ( e )
+ {
+ baseHref = parentWindow.document.location.protocol + '://' + parentWindow.parent.document.location.host ;
+ }
+ }
+
+ url = baseHref + url ;
+ }
+
+ if ( !window.open( url, '_blank' ) )
+ alert( FCKLang.VisitLinkBlocked ) ;
+ }
+} ;
+
// FCKSelectAllCommand
var FCKSelectAllCommand = function()
@@ -517,2 +576,40 @@
}
};
+
+var FCKDeleteDivCommand = function()
+{
+}
+FCKDeleteDivCommand.prototype =
+{
+ GetState : function()
+ {
+ if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ return FCK_TRISTATE_DISABLED ;
+
+ var node = FCKSelection.GetParentElement() ;
+ var path = new FCKElementPath( node ) ;
+ return path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+ },
+
+ Execute : function()
+ {
+ // Create an undo snapshot before doing anything.
+ FCKUndo.SaveUndoStep() ;
+
+ // Find out the nodes to delete.
+ var nodes = FCKDomTools.GetSelectedDivContainers() ;
+
+ // Remember the current selection position.
+ var range = new FCKDomRange( FCK.EditorWindow ) ;
+ range.MoveToSelection() ;
+ var bookmark = range.CreateBookmark() ;
+
+ // Delete the container DIV node.
+ for ( var i = 0 ; i < nodes.length ; i++)
+ FCKDomTools.RemoveNode( nodes[i], true ) ;
+
+ // Restore selection.
+ range.MoveToBookmark( bookmark ) ;
+ range.Select() ;
+ }
+} ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js (revision 2229)
@@ -37,4 +37,9 @@
var eBodyStyle = eBody.style ;
var eParent ;
+
+ // Save the current selection and scroll position.
+ var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+ oRange.MoveToSelection() ;
+ var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
// No original style properties known? Go fullscreen.
@@ -161,4 +166,8 @@
FCK.Focus() ;
+
+ // Restore the selection and scroll position of inside the document.
+ oRange.Select() ;
+ FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
}
Index: /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckshowblocks.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckshowblocks.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckshowblocks.js (revision 2229)
@@ -45,4 +45,21 @@
body.className += ' FCK__ShowBlocks' ;
+ if ( FCKBrowserInfo.IsIE )
+ {
+ try
+ {
+ FCK.EditorDocument.selection.createRange().select() ;
+ }
+ catch ( e )
+ {}
+ }
+ else
+ {
+ var focus = FCK.EditorWindow.getSelection().focusNode ;
+ if ( focus.nodeType != 1 )
+ focus = focus.parentNode ;
+ FCKDomTools.ScrollIntoView( focus, false ) ;
+ }
+
FCK.Events.FireEvent( 'OnSelectionChange' ) ;
}
Index: /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js (revision 2229)
@@ -116,5 +116,5 @@
FCKAdobeAIR.FCKeditorAPI_Evaluate( oParentWindow, sScript ) ;
}
- else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko19 )
+ else if ( FCKBrowserInfo.IsSafari )
{
// oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fck.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fck.js (revision 2229)
@@ -632,5 +632,6 @@
var sHtml ;
- // Update the HTML in the view output to show.
+ // Update the HTML in the view output to show, also update
+ // FCKTempBin for IE to avoid #2263.
if ( bIsWysiwyg )
{
@@ -640,4 +641,7 @@
sHtml = FCK.GetXHTML( FCKConfig.FormatSource ) ;
+
+ if ( FCKBrowserInfo.IsIE )
+ FCKTempBin.ToHtml() ;
if ( sHtml == null )
@@ -710,9 +714,9 @@
range.MoveToPosition( element, 4 ) ;
- if ( FCKBrowserInfo.IsGecko )
+ if ( FCKBrowserInfo.IsGeckoLike )
{
if ( next )
- next.scrollIntoView( false ) ;
- element.scrollIntoView( false ) ;
+ FCKDomTools.ScrollIntoView( next, false );
+ FCKDomTools.ScrollIntoView( element, false );
}
}
@@ -938,4 +942,7 @@
FCK.EditorDocument = FCK.EditingArea.Document ;
+ if ( FCKBrowserInfo.IsIE )
+ FCKTempBin.ToElements() ;
+
FCK.InitializeBehaviors() ;
@@ -1090,4 +1097,23 @@
this.Elements[ i++ ] = null ;
this.Elements.length = 0 ;
+ },
+
+ ToHtml : function()
+ {
+ for ( var i = 0 ; i < this.Elements.length ; i++ )
+ this.Elements[i] = this.Elements[i].outerHTML ;
+ },
+
+ ToElements : function()
+ {
+ var node = FCK.EditorDocument.createElement( 'div' ) ;
+ for ( var i = 0 ; i < this.Elements.length ; i++ )
+ {
+ if ( typeof( this.Elements[i] ) == 'string' )
+ {
+ node.innerHTML = this.Elements[i] ;
+ this.Elements[i] = node.firstChild ;
+ }
+ }
}
} ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_contextmenu.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_contextmenu.js (revision 2229)
@@ -129,4 +129,6 @@
menu.AddSeparator() ;
+ menu.AddItem( 'VisitLink', FCKLang.VisitLink ) ;
+ menu.AddSeparator() ;
if ( bInsideLink )
menu.AddItem( 'Link', FCKLang.EditLink , 34 ) ;
@@ -293,4 +295,19 @@
}
}} ;
+
+ case 'DivContainer':
+ return {
+ AddItems : function( menu, tag, tagName )
+ {
+ var currentBlocks = FCKDomTools.GetSelectedDivContainers() ;
+
+ if ( currentBlocks.length > 0 )
+ {
+ menu.AddSeparator() ;
+ menu.AddItem( 'EditDiv', FCKLang.EditDiv, 75 ) ;
+ menu.AddItem( 'DeleteDiv', FCKLang.DeleteDiv, 76 ) ;
+ }
+ }} ;
+
// @Packager.Remove.Start
default :
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fckcommands.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fckcommands.js (revision 2229)
@@ -52,4 +52,5 @@
case 'Link' : oCommand = new FCKDialogCommand( 'Link' , FCKLang.DlgLnkWindowTitle , 'dialog/fck_link.html' , 400, 300 ) ; break ;
case 'Unlink' : oCommand = new FCKUnlinkCommand() ; break ;
+ case 'VisitLink' : oCommand = new FCKVisitLinkCommand() ; break ;
case 'Anchor' : oCommand = new FCKDialogCommand( 'Anchor' , FCKLang.DlgAnchorTitle , 'dialog/fck_anchor.html' , 370, 160 ) ; break ;
case 'AnchorDelete' : oCommand = new FCKAnchorDeleteCommand() ; break ;
@@ -95,4 +96,7 @@
case 'Outdent' : oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; break ;
case 'Blockquote' : oCommand = new FCKBlockQuoteCommand() ; break ;
+ case 'CreateDiv' : oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.CreateDiv, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
+ case 'EditDiv' : oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.EditDiv, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
+ case 'DeleteDiv' : oCommand = new FCKDeleteDivCommand() ; break ;
case 'TableInsertRowAfter' : oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fckdomtools.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fckdomtools.js (revision 2229)
@@ -697,5 +697,5 @@
SetElementMarker : function ( markerObj, element, attrName, value)
{
- var id = String( parseInt( Math.random() * 0xfffffff, 10 ) ) ;
+ var id = String( parseInt( Math.random() * 0xffffffff, 10 ) ) ;
element._FCKMarkerId = id ;
element[attrName] = value ;
@@ -990,20 +990,19 @@
if ( alignTop === false )
{
- offset += element.offsetHeight ;
+ offset += element.offsetHeight || 0 ;
// 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( element, 'marginBottom' ) || 0, 10 ) ;
+ offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) || 0 ;
}
// Appends the offsets for the entire element hierarchy.
- offset += element.offsetTop ;
- while ( ( element = element.offsetParent ) )
- offset += element.offsetTop || 0 ;
+ var elementPosition = FCKTools.GetDocumentPosition( window, element ) ;
+ offset += elementPosition.y ;
// Scroll the window to the desired position, if not already visible.
var currentScroll = FCKTools.GetScrollPosition( window ).Y ;
- if ( offset > 0 && offset > currentScroll )
+ if ( offset > 0 && ( offset > currentScroll || offset < currentScroll - windowHeight ) )
window.scrollTo( 0, offset ) ;
},
@@ -1022,4 +1021,37 @@
// In the DTD # == text node.
return ( childDTD['#'] && !FCKListsLib.NonEditableElements[ nodeName ] ) ;
+ },
+
+ GetSelectedDivContainers : function()
+ {
+ var currentBlocks = [] ;
+ var range = new FCKDomRange( FCK.EditorWindow ) ;
+ range.MoveToSelection() ;
+
+ var startNode = range.GetTouchedStartNode() ;
+ var endNode = range.GetTouchedEndNode() ;
+ var currentNode = startNode ;
+
+ if ( startNode == endNode )
+ {
+ while ( endNode.nodeType == 1 && endNode.lastChild )
+ endNode = endNode.lastChild ;
+ endNode = FCKDomTools.GetNextSourceNode( endNode ) ;
+ }
+
+ while ( currentNode && currentNode != endNode )
+ {
+ if ( currentNode.nodeType != 3 || !/^[ \t\n]*$/.test( currentNode.nodeValue ) )
+ {
+ var path = new FCKElementPath( currentNode ) ;
+ var blockLimit = path.BlockLimit ;
+ if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
+ currentBlocks.push( blockLimit ) ;
+ }
+
+ currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+ }
+
+ return currentBlocks ;
}
} ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fckselection_gecko.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fckselection_gecko.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fckselection_gecko.js (revision 2229)
@@ -76,7 +76,15 @@
if ( oSel )
{
- // make the common case fast - for collapsed/nearly collapsed selections just return anchor.parent.
+ // if anchorNode == focusNode, see if the selection is text only or including nodes.
+ // if text only, return the parent node.
+ // if the selection includes DOM nodes, then the anchorNode is the nearest container.
if ( oSel.anchorNode && oSel.anchorNode == oSel.focusNode )
- return oSel.anchorNode.parentNode ;
+ {
+ var oRange = oSel.getRangeAt( 0 ) ;
+ if ( oRange.collapsed || oRange.startContainer.nodeType == 3 )
+ return oSel.anchorNode.parentNode ;
+ else
+ return oSel.anchorNode ;
+ }
// looks like we're having a large selection here. To make the behavior same as IE's TextRange.parentElement(),
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktablehandler.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktablehandler.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktablehandler.js (revision 2229)
@@ -678,4 +678,9 @@
FCKTableHandler._InstallTableMap = function( tableMap, table )
{
+ // Workaround for #1917 : MSIE will always report a cell's rowSpan as 1 as long
+ // as the cell is not attached to a row. So we'll need an alternative attribute
+ // for storing the calculated rowSpan in IE.
+ var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
+
// Clear the table of all rows first.
while ( table.rows.length > 0 )
@@ -693,5 +698,5 @@
if ( cell.parentNode )
cell.parentNode.removeChild( cell ) ;
- cell.colSpan = cell.rowSpan = 1 ;
+ cell.colSpan = cell[rowSpanAttr] = 1 ;
}
}
@@ -728,5 +733,5 @@
continue ;
if ( tableMap[j-1] && tableMap[j-1][i] == cell )
- cell.rowSpan++ ;
+ cell[rowSpanAttr]++ ;
if ( ! tableMap[j+1] || tableMap[j+1][i] != cell )
cell._rowScanned = true ;
@@ -766,4 +771,9 @@
}
rowObj.appendChild( cell ) ;
+ if ( rowSpanAttr != 'rowSpan' )
+ {
+ cell.rowSpan = cell[rowSpanAttr] ;
+ cell.removeAttribute( rowSpanAttr ) ;
+ }
j += cell.colSpan ;
if ( cell.colSpan == 1 )
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktoolbaritems.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktoolbaritems.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktoolbaritems.js (revision 2229)
@@ -72,4 +72,5 @@
case 'Indent' : oItem = new FCKToolbarButton( 'Indent' , FCKLang.IncreaseIndent, null, null, false, true, 29 ) ; break ;
case 'Blockquote' : oItem = new FCKToolbarButton( 'Blockquote' , FCKLang.Blockquote, null, null, false, true, 73 ) ; break ;
+ case 'CreateDiv' : oItem = new FCKToolbarButton( 'CreateDiv' , FCKLang.CreateDiv, null, null, false, true, 74 ) ; break ;
case 'Link' : oItem = new FCKToolbarButton( 'Link' , FCKLang.InsertLinkLbl, FCKLang.InsertLink, null, false, true, 34 ) ; break ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktools_ie.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktools_ie.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fcktools_ie.js (revision 2229)
@@ -76,5 +76,6 @@
case 'XmlHttp' :
// Try the native XMLHttpRequest introduced with IE7.
- try { return new XMLHttpRequest() ; } catch (e) {}
+ if ( document.location.protocol != 'file:' )
+ try { return new XMLHttpRequest() ; } catch (e) {}
aObjs = [ 'MSXML2.XmlHttp', 'Microsoft.XmlHttp' ] ;
Index: /FCKeditor/branches/features/new_samples/editor/_source/internals/fckxhtml.js
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/_source/internals/fckxhtml.js (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fckxhtml.js (revision 2229)
@@ -205,7 +205,14 @@
// Ignore bogus BR nodes in the DOM.
if ( FCKBrowserInfo.IsGecko &&
- htmlNode.nextSibling &&
( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) )
- return false ;
+ {
+ if ( htmlNode.nextSibling )
+ return false ;
+ else
+ {
+ htmlNode.removeAttribute( '_moz_editor_bogus_node' ) ;
+ htmlNode.removeAttribute( 'type' ) ;
+ }
+ }
// This is for elements that are instrumental to FCKeditor and
Index: /FCKeditor/branches/features/new_samples/editor/css/fck_editorarea.css
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/css/fck_editorarea.css (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/css/fck_editorarea.css (revision 2229)
@@ -27,8 +27,8 @@
*/
-/*
- The "body" styles should match your editor web site, mainly regarding
- background color and font family and size.
-*/
+/**
+ * The "body" styles should match your editor web site, mainly regarding
+ * background color and font family and size.
+ */
body
@@ -51,8 +51,8 @@
}
-/*
- Just uncomment the following block if you want to avoid spaces between
- paragraphs. Remember to apply the same style in your output front end page.
-*/
+/**
+ * Just uncomment the following block if you want to avoid spaces between
+ * paragraphs. Remember to apply the same style in your output front end page.
+ */
/*
@@ -64,9 +64,27 @@
*/
+/**
+ * Uncomment the following block, or only selected lines if appropriate,
+ * if you have some style items that would break the styles combo box.
+ * You can also write other CSS overrides inside the style block below
+ * as needed and they will be applied to inside the style combo only.
+ */
+
/*
- The following are some sample styles used in the "Styles" toolbar command.
- You should instead remove them, and include the styles used by the site
- you are using the editor in.
+.SC_Item *, .SC_ItemSelected *
+{
+ margin: 0px !important;
+ padding: 0px !important;
+ text-indent: 0px !important;
+ clip: auto !important;
+ position: static !important;
+}
*/
+
+/**
+ * The following are some sample styles used in the "Styles" toolbar command.
+ * You should instead remove them, and include the styles used by the site
+ * you are using the editor in.
+ */
.Bold
Index: /FCKeditor/branches/features/new_samples/editor/dialog/fck_anchor.html
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/dialog/fck_anchor.html (revision 2228)
+++ /FCKeditor/branches/features/new_samples/editor/dialog/fck_anchor.html (revision 2229)
@@ -122,5 +122,11 @@
{
// Nothing was selected, so now just create a normal A
- aNewAnchors.push( oEditor.FCK.InsertElement( 'a' ) ) ;
+ if ( FCKBrowserInfo.IsIE )
+ aNewAnchors.push( oEditor.FCK.InsertElement( '' ) ) ;
+ else
+ {
+ var n ;
+ aNewAnchors.push( ( n = oEditor.FCK.InsertElement( 'a' ), n.name = sNewName, n ) ) ;
+ }
}
else
@@ -135,7 +141,4 @@
{
oAnchor = aNewAnchors[i] ;
-
- // Set the name
- oAnchor.name = sNewName ;
// IE does require special processing to show the Anchor's image
Index: /FCKeditor/branches/features/new_samples/editor/dialog/fck_div.html
===================================================================
--- /FCKeditor/branches/features/new_samples/editor/dialog/fck_div.html (revision 2229)
+++ /FCKeditor/branches/features/new_samples/editor/dialog/fck_div.html (revision 2229)
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+
+
+
+ Style
+
+
+
+
+ Stylesheet Classes
+
+
+