Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html (revision 32)
+++ /FCKeditor/trunk/_whatsnew.html (revision 33)
@@ -55,5 +55,15 @@
PATCH-1456343] New sample file showing how to dinamically exchange a textarea and an instance of FCKeditor.
Thanks to Finn Hakansson
-
+ [SF
+ PATCH-1496115] [SF
+ BUG-1588578] [SF
+ BUG-1376534] [SF
+ BUG-1343506] [SF
+ Feature-1211065] [SF
+ Feature-949144] The content of anchors are shown and preserved on creation. *
+ [SF
+ Feature-1587175] Local links to an anchor are readjusted if the anchor changes.
+
+
Fixed Bugs:
@@ -134,4 +144,6 @@
[SF BUG-1610790] On some specific situations, the call to form.submit(), in form were FCKeditor has
been unloaded by code, was throwing the "Can't execute code from a freed script" error.
+
+ * This version has been partially sponsored by Medical Media Lab.
Version 2.3.2
Index: /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 32)
+++ /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 33)
@@ -5,4 +5,5 @@
+
*/
@@ -294,5 +295,16 @@
FCKUnlinkCommand.prototype.GetState = function()
{
- return FCK.GetNamedCommandState( this.Name ) ;
+ var state = FCK.GetNamedCommandState( this.Name ) ;
+
+ // Check that it isn't an anchor
+ if ( state == FCK_TRISTATE_OFF && FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+ {
+ var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+ var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+ if ( bIsAnchor )
+ state = FCK_TRISTATE_DISABLED ;
+ }
+
+ return state ;
}
Index: /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js (revision 32)
+++ /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js (revision 33)
@@ -5,4 +5,5 @@
+
*/
@@ -88,4 +89,11 @@
if ( bInsideLink || FCK.GetNamedCommandState( 'Unlink' ) != FCK_TRISTATE_DISABLED )
{
+ // Go up to the anchor to test its properties
+ var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+ var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+ // If it isn't a link then don't add the Link context menu
+ if ( bIsAnchor )
+ return ;
+
menu.AddSeparator() ;
if ( bInsideLink )
@@ -110,5 +118,9 @@
AddItems : function( menu, tag, tagName )
{
- if ( tagName == 'IMG' && tag.getAttribute( '_fckanchor' ) )
+ // Go up to the anchor to test its properties
+ var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+ var bIsAnchor = ( oLink && oLink.name.length > 0 ) ;
+
+ if ( bIsAnchor || ( tagName == 'IMG' && tag.getAttribute( '_fckanchor' ) ) )
{
menu.AddSeparator() ;
Index: /FCKeditor/trunk/editor/_source/internals/fckdocumentprocessor.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckdocumentprocessor.js (revision 32)
+++ /FCKeditor/trunk/editor/_source/internals/fckdocumentprocessor.js (revision 33)
@@ -4,4 +4,5 @@
+
*/
@@ -34,21 +35,33 @@
// Link Anchors
-var FCKAnchorsProcessor = FCKDocumentProcessor.AppendNew() ;
-FCKAnchorsProcessor.ProcessDocument = function( document )
+if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
{
- var aLinks = document.getElementsByTagName( 'A' ) ;
+ var FCKAnchorsProcessor = FCKDocumentProcessor.AppendNew() ;
+ FCKAnchorsProcessor.ProcessDocument = function( document )
+ {
+ var aLinks = document.getElementsByTagName( 'A' ) ;
- var oLink ;
- var i = aLinks.length - 1 ;
- while ( i >= 0 && ( oLink = aLinks[i--] ) )
- {
- // If it is anchor.
- if ( oLink.name.length > 0 && ( !oLink.getAttribute('href') || oLink.getAttribute('href').length == 0 ) )
+ var oLink ;
+ var i = aLinks.length - 1 ;
+ while ( i >= 0 && ( oLink = aLinks[i--] ) )
{
- var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oLink.cloneNode(true) ) ;
- oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
-
- oLink.parentNode.insertBefore( oImg, oLink ) ;
- oLink.parentNode.removeChild( oLink ) ;
+ // If it is anchor. Doesn't matter if it's also a link (even better: we show that it's both a link and an anchor)
+ if ( oLink.name.length > 0 )
+ {
+ //if the anchor has some content then we just add a temporary class
+ if ( oLink.innerHTML != '' )
+ {
+ if ( FCKBrowserInfo.IsIE )
+ oLink.className += ' FCK__AnchorC' ;
+ }
+ else
+ {
+ var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oLink.cloneNode(true) ) ;
+ oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
+
+ oLink.parentNode.insertBefore( oImg, oLink ) ;
+ oLink.parentNode.removeChild( oLink ) ;
+ }
+ }
}
}
Index: /FCKeditor/trunk/editor/_source/internals/fckregexlib.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckregexlib.js (revision 32)
+++ /FCKeditor/trunk/editor/_source/internals/fckregexlib.js (revision 33)
@@ -4,4 +4,5 @@
+
*/
@@ -36,5 +37,6 @@
HeadCloser : /<\/head\s*>/i ,
-TableBorderClass : /\s*FCK__ShowTableBorders\s*/ ,
+// Temporary classes (Tables without border, Anchors with content) used in IE
+FCK_Class : /(\s*FCK__[A-Za-z]*\s*)/ ,
// Validate element names (it must be in lowercase).
Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckxhtml.js (revision 32)
+++ /FCKeditor/trunk/editor/_source/internals/fckxhtml.js (revision 33)
@@ -4,4 +4,5 @@
+
*/
@@ -275,4 +276,20 @@
}
+// Remove part of an attribute from a node according to a regExp
+FCKXHtml._RemoveAttribute = function( xmlNode, regX, sAttribute )
+{
+ var oAtt = xmlNode.attributes.getNamedItem( sAttribute ) ;
+
+ if ( oAtt && regX.test( oAtt.nodeValue ) )
+ {
+ var sValue = oAtt.nodeValue.replace( regX, '' ) ;
+
+ if ( sValue.length == 0 )
+ xmlNode.attributes.removeNamedItem( sAttribute ) ;
+ else
+ oAtt.nodeValue = sValue ;
+ }
+}
+
// An object that hold tag specific operations.
FCKXHtml.TagProcessors =
@@ -297,4 +314,15 @@
FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
+
+ // Anchors with content has been marked with an additional class, now we must remove it.
+ if ( FCKBrowserInfo.IsIE )
+ {
+ FCKXHtml._RemoveAttribute( node, FCKRegexLib.FCK_Class, 'class' ) ;
+
+ // Buggy IE, doesn't copy the name of changed anchors.
+ if ( htmlNode.name )
+ FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+ }
+
FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
@@ -340,15 +368,6 @@
// table class the FCK__ShowTableBorders rule. So now we must remove it.
- var oClassAtt = node.attributes.getNamedItem( 'class' ) ;
-
- if ( oClassAtt && FCKRegexLib.TableBorderClass.test( oClassAtt.nodeValue ) )
- {
- var sClass = oClassAtt.nodeValue.replace( FCKRegexLib.TableBorderClass, '' ) ;
-
- if ( sClass.length == 0 )
- node.attributes.removeNamedItem( 'class' ) ;
- else
- FCKXHtml._AppendAttribute( node, 'class', sClass ) ;
- }
+ if ( FCKBrowserInfo.IsIE )
+ FCKXHtml._RemoveAttribute( node, FCKRegexLib.FCK_Class, 'class' ) ;
FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
Index: /FCKeditor/trunk/editor/css/fck_editorarea.css
===================================================================
--- /FCKeditor/trunk/editor/css/fck_editorarea.css (revision 32)
+++ /FCKeditor/trunk/editor/css/fck_editorarea.css (revision 33)
@@ -9,4 +9,5 @@
+
*/
@@ -29,5 +30,5 @@
}
-a
+a[href]
{
color: #0000FF !important; /* For Firefox... mark as important, otherwise it becomes black */
Index: /FCKeditor/trunk/editor/css/fck_internal.css
===================================================================
--- /FCKeditor/trunk/editor/css/fck_internal.css (revision 32)
+++ /FCKeditor/trunk/editor/css/fck_internal.css (revision 33)
@@ -4,4 +4,5 @@
+
*/
@@ -35,6 +36,8 @@
}
+/* Empty anchors images */
.FCK__Anchor
{
+ border: 1px dotted #00F;
background-position: center center;
background-image: url(images/fck_anchor.gif);
@@ -42,4 +45,26 @@
width: 16px;
height: 15px;
+ vertical-align: middle;
+}
+
+/* Anchors with content */
+.FCK__AnchorC
+{
+ border: 1px dotted #00F;
+ background-position: 1 center;
+ background-image: url(images/fck_anchor.gif);
+ background-repeat: no-repeat;
+ padding-left:18px;
+}
+
+/* Any anchor for non-IE, if we combine it
+ with the previous rule IE ignores all. */
+a[name]
+{
+ border: 1px dotted #00F;
+ background-position: 0 center;
+ background-image: url(images/fck_anchor.gif);
+ background-repeat: no-repeat;
+ padding-left:18px;
}
Index: /FCKeditor/trunk/editor/dialog/fck_anchor.html
===================================================================
--- /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 32)
+++ /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 33)
@@ -5,4 +5,5 @@
+
-->
@@ -17,4 +18,7 @@
var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
+var FCKTools = oEditor.FCKTools ;
+var FCKRegexLib = oEditor.FCKRegexLib ;
// Gets the document DOM
@@ -32,4 +36,12 @@
}
+//Search for a real anchor
+if ( !oFakeImage )
+{
+ oAnchor = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+ if ( oAnchor )
+ FCK.Selection.SelectNode( oAnchor ) ;
+}
+
window.onload = function()
{
@@ -47,6 +59,19 @@
function Ok()
{
- if ( GetE('txtName').value.length == 0 )
- {
+ var sNewName = GetE('txtName').value ;
+
+ // Remove any illegal character in a name attribute:
+ // A name should start with a letter, but the validator passes anyway.
+ sNewName = sNewName.replace( /[^\w-_\.:]/g, '_' ) ;
+
+ if ( sNewName.length == 0 )
+ {
+ // Remove the anchor if the user leaves the name blank
+ if ( oAnchor )
+ {
+ RemoveAnchor() ;
+ return true ;
+ }
+
alert( oEditor.FCKLang.DlgAnchorErrorName ) ;
return false ;
@@ -55,14 +80,115 @@
oEditor.FCKUndo.SaveUndoStep() ;
- oAnchor = FCK.EditorDocument.createElement( 'DIV' ) ;
- oAnchor.innerHTML = '<\/a>' ;
- oAnchor = oAnchor.firstChild ;
-
- oFakeImage = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor ) ;
- oFakeImage.setAttribute( '_fckanchor', 'true', 0 ) ;
- oFakeImage = FCK.InsertElementAndGetIt( oFakeImage ) ;
-
-// oEditor.FCK.InsertHtml( '<\/a>' ) ;
+ if ( oAnchor ) // Modifying an existent anchor.
+ {
+ ReadjustLinksToAnchor( oAnchor.name, sNewName );
+
+ // Buggy explorer, bad bad browser. http://alt-tag.com/blog/archives/2006/02/ie-dom-bugs/
+ // Instead of just replacing the .name for the existing anchor (in order to preserve the content), we must remove the .name
+ // and assign .name, although it won't appear until it's specially processed in fckxhtml.js
+
+ // We remove the previous name
+ oAnchor.removeAttribute( 'name' ) ;
+ // Now we set it, but later we must process it specially
+ oAnchor.name = sNewName ;
+
+ return true ;
+ }
+
+ // Create a new anchor preserving the current selection
+ oAnchor = oEditor.FCK.CreateLink( '#' ) ;
+ if ( !oAnchor )
+ {
+ // Nothing was selected, so now just create a normal A
+ oAnchor = oEditor.FCK.CreateElement( 'a' ) ;
+ }
+ else
+ {
+ // Remove the fake href
+ oAnchor.removeAttribute( 'href' ) ;
+ }
+ // Set the name
+ oAnchor.name = sNewName ;
+
+ // IE does require special processing to show the Anchor's image
+ // Opera doesn't allow to select empty anchors
+ if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
+ {
+ if ( oAnchor.innerHTML != '' )
+ {
+ if ( FCKBrowserInfo.IsIE )
+ oAnchor.className += ' FCK__AnchorC' ;
+ }
+ else
+ {
+ // Create a fake image for both IE and Opera
+ var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
+ oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
+
+ oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
+ oAnchor.parentNode.removeChild( oAnchor ) ;
+ }
+
+ }
+
return true ;
+}
+
+// Removes the current anchor from the document
+function RemoveAnchor()
+{
+ // If it's also a link, then just remove the name and exit
+ if ( oAnchor.href.length != 0 )
+ {
+ oAnchor.removeAttribute( 'name' ) ;
+ // Remove temporary class for IE
+ if ( FCKBrowserInfo.IsIE )
+ oAnchor.className = oAnchor.className.replace( FCKRegexLib.FCK_Class, '' ) ;
+ return ;
+ }
+
+ // We need to remove the anchor
+ // If we got a fake image, then just remove it and we're done
+ if ( oFakeImage )
+ {
+ oFakeImage.parentNode.removeChild( oFakeImage ) ;
+ return ;
+ }
+ // Empty anchor, so just remove it
+ if ( oAnchor.innerHTML.length == 0 )
+ {
+ oAnchor.parentNode.removeChild( oAnchor ) ;
+ return ;
+ }
+ // Anchor with content, leave the content
+ FCKTools.RemoveOuterTags( oAnchor ) ;
+}
+
+// Checks all the links in the current page pointing to the current name and changes them to the new name
+function ReadjustLinksToAnchor( sCurrent, sNew )
+{
+ var oDoc = FCK.EditorDocument ;
+
+ var aLinks = oDoc.getElementsByTagName( 'A' ) ;
+
+ var sReference = '#' + sCurrent ;
+ // The url of the document, so we check absolute and partial references.
+ var sFullReference = oDoc.location.href.replace( /(#.*$)/, '') ;
+ sFullReference += sReference ;
+
+ var oLink ;
+ var i = aLinks.length - 1 ;
+ while ( i >= 0 && ( oLink = aLinks[i--] ) )
+ {
+ var sHRef = oLink.getAttribute( '_fcksavedurl' ) ;
+ if ( sHRef == null )
+ sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
+
+ if ( sHRef == sReference || sHRef == sFullReference )
+ {
+ oLink.href = '#' + sNew ;
+ SetAttribute( oLink, '_fcksavedurl', '#' + sNew ) ;
+ }
+ }
}
Index: /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js
===================================================================
--- /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 32)
+++ /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 33)
@@ -5,4 +5,5 @@
+
*/
@@ -11,4 +12,5 @@
var FCKLang = oEditor.FCKLang ;
var FCKConfig = oEditor.FCKConfig ;
+var FCKRegexLib = oEditor.FCKRegexLib ;
//#### Dialog Tabs
@@ -158,4 +160,12 @@
aAnchors[ aAnchors.length ] = oEditor.FCK.GetRealElement( oImages[i] ) ;
}
+
+ // Add also real anchors
+ var oLinks = oEditor.FCK.EditorDocument.getElementsByTagName( 'A' ) ;
+ for( var i = 0 ; i < oLinks.length ; i++ )
+ {
+ if ( oLinks[i].name && ( oLinks[i].name.length > 0 ) )
+ aAnchors[ aAnchors.length ] = oLinks[i] ;
+ }
var aIds = oEditor.FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
@@ -188,6 +198,6 @@
var sHRef = oLink.getAttribute( '_fcksavedurl' ) ;
if ( sHRef == null )
- sHRef = oLink.getAttribute( 'href' , 2 ) + '' ;
-
+ sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
+
// Look for a popup javascript link.
var oPopupMatch = oRegex.PopupUri.exec( sHRef ) ;
@@ -268,14 +278,19 @@
GetE('txtAttCharSet').value = oLink.charset ;
+ var sClass ;
if ( oEditor.FCKBrowserInfo.IsIE )
{
- GetE('txtAttClasses').value = oLink.getAttribute('className',2) || '' ;
+ sClass = oLink.getAttribute('className',2) || '' ;
+ // Clean up temporary classes for internal use:
+ sClass = sClass.replace( FCKRegexLib.FCK_Class, '' ) ;
+
GetE('txtAttStyle').value = oLink.style.cssText ;
}
else
{
- GetE('txtAttClasses').value = oLink.getAttribute('class',2) || '' ;
- GetE('txtAttStyle').value = oLink.getAttribute('style',2) ;
- }
+ sClass = oLink.getAttribute('class',2) || '' ;
+ GetE('txtAttStyle').value = oLink.getAttribute('style',2) || '' ;
+ }
+ GetE('txtAttClasses').value = sClass ;
// Update the Link type combo.
@@ -526,5 +541,5 @@
// Advances Attributes
SetAttribute( oLink, 'id' , GetE('txtAttId').value ) ;
- SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ; // No IE. Set but doesnt't update the outerHTML.
+ SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ;
SetAttribute( oLink, 'dir' , GetE('cmbAttLangDir').value ) ;
SetAttribute( oLink, 'lang' , GetE('txtAttLangCode').value ) ;
@@ -537,5 +552,10 @@
if ( oEditor.FCKBrowserInfo.IsIE )
{
- SetAttribute( oLink, 'className', GetE('txtAttClasses').value ) ;
+ var sClass = GetE('txtAttClasses').value ;
+ // If it's also an anchor add an internal class
+ if ( GetE('txtAttName').value.length != 0 )
+ sClass += ' FCK__AnchorC' ;
+ SetAttribute( oLink, 'className', sClass ) ;
+
oLink.style.cssText = GetE('txtAttStyle').value ;
}