unlink execCommand bug

+ Description:
+ After removing both links with execCommand("unlink", false, null) the first one will turn into a span.
+ The script will show the innerHTML of the first paragraph after execution of the calls +

system to clip the image correctly. + eIcon = document.createElement( 'DIV' ) ; - // IE makes the button 1px higher if using the directly, so we - // are changing to the

system to clip the image correctly. - eIcon = document.createElement( 'DIV' ) ; - - eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ; - eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ; + eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ; + eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ; + } + else + { + // This is not working well with IE. See notes above. + //

+ eIcon = document.createElement( 'IMG' ) ; + eIcon.src = this.Path ? this.Path : FCK_SPACER_PATH ; + } } Index: /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckpanel.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckpanel.js (revision 361) @@ -254,5 +254,5 @@ var oWindow = this._Popup ? FCKTools.GetDocumentWindow( this.Document ) : this._Window ; - var oChildPanel = new FCKPanel( oWindow, true ) ; + var oChildPanel = new FCKPanel( oWindow ) ; oChildPanel.ParentPanel = this ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckspecialcombo.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckspecialcombo.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/classes/fckspecialcombo.js (revision 361) @@ -37,5 +37,5 @@ this.Items = new Object() ; - this._Panel = new FCKPanel( parentWindow || window, true ) ; + this._Panel = new FCKPanel( parentWindow || window ) ; this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ; this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fck_othercommands.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fck_othercommands.js (revision 361) @@ -169,5 +169,10 @@ // Submit the form. - oForm.submit() ; + // If there's a button named "submit" then the form.submit() function is masked and + // can't be called in Mozilla, so we call the click() method of that button. + if ( typeof( oForm.submit ) == 'function' ) + oForm.submit() ; + else + oForm.submit.click() ; } @@ -299,12 +304,12 @@ { var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ; + // The unlink command can generate a span in Firefox, so let's do it our way. See #430 if ( oLink ) - FCK.Selection.SelectNode( oLink ) ; - } - + FCKTools.RemoveOuterTags( oLink ) ; + + return ; + } + FCK.ExecuteNamedCommand( this.Name ) ; - - if ( FCKBrowserInfo.IsGecko ) - FCK.Selection.Collapse( true ) ; } Index: /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 361) @@ -39,5 +39,5 @@ oWindow = window.parent ; - this._Panel = new FCKPanel( oWindow, true ) ; + this._Panel = new FCKPanel( oWindow ) ; this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ; this._Panel.MainNode.className = 'FCK_Panel' ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck.js (revision 361) @@ -32,4 +32,9 @@ HasFocus : false, + AttachToOnSelectionChange : function( functionPointer ) + { + this.Events.AttachEvent( 'OnSelectionChange', functionPointer ) ; + }, + GetLinkedFieldValue : function() { @@ -88,5 +93,5 @@ this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ; - this.EditingArea.FFSpellChecker = false ; + this.EditingArea.FFSpellChecker = FCKConfig.FirefoxSpellChecker ; // Final setup of the lists lib. @@ -294,5 +299,5 @@ // IE doesn't support and it breaks it. Let's protect it. if ( FCKBrowserInfo.IsIE ) - sTags += sTags.length > 0 ? '|ABBR' : 'ABBR' ; + sTags += sTags.length > 0 ? '|ABBR|XML' : 'ABBR|XML' ; var oRegex ; @@ -317,5 +322,5 @@ sTags += '|HR' ; - oRegex = new RegExp( '<((' + sTags + ')(?=\s|>)[\s\S]*?)/?>', 'gi' ) ; + oRegex = new RegExp( '<((' + sTags + ')(?=\\s|>|/)[\\s\\S]*?)/?>', 'gi' ) ; html = html.replace( oRegex, '' ) ; @@ -762,5 +767,5 @@ var i = 0 ; while ( i < this.Elements.length ) - this.Elements[ i++ ] == null ; + this.Elements[ i++ ] = null ; this.Elements.length = 0 ; } Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_contextmenu.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_contextmenu.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_contextmenu.js (revision 361) @@ -35,4 +35,5 @@ { var oInnerContextMenu = FCK.ContextMenu._InnerContextMenu = new FCKContextMenu( FCKBrowserInfo.IsIE ? window : window.parent, FCKLang.Dir ) ; + oInnerContextMenu.CtrlDisable = FCKConfig.BrowserContextMenuOnCtrl ; oInnerContextMenu.OnBeforeOpen = FCK_ContextMenu_OnBeforeOpen ; oInnerContextMenu.OnItemClick = FCK_ContextMenu_OnItemClick ; Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_gecko.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_gecko.js (revision 361) @@ -123,9 +123,4 @@ FCK.ExecuteNamedCommand( commandName, commandParameter ) ; } -} - -FCK.AttachToOnSelectionChange = function( functionPointer ) -{ - this.Events.AttachEvent( 'OnSelectionChange', functionPointer ) ; } @@ -231,4 +226,7 @@ FCK.CreateLink = function( url ) { + // Creates the array that will be returned. It contains one or more created links (see #220). + var aCreatedLinks = new Array() ; + FCK.ExecuteNamedCommand( 'Unlink' ) ; @@ -241,14 +239,16 @@ FCK.ExecuteNamedCommand( 'CreateLink', sTempUrl ) ; - // Retrieve the just created link using XPath. - var oLink = this.EditorDocument.evaluate("//a[@href='" + sTempUrl + "']", this.EditorDocument.body, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue ; - - if ( oLink ) + // Retrieve the just created links using XPath. + var oLinksInteractor = this.EditorDocument.evaluate("//a[@href='" + sTempUrl + "']", this.EditorDocument.body, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null) ; + + // Add all links to the returning array. + for ( var i = 0 ; i < oLinksInteractor.snapshotLength ; i++ ) { + var oLink = oLinksInteractor.snapshotItem( i ) ; oLink.href = url ; - return oLink ; + aCreatedLinks.push( oLink ) ; } } - return null ; -} + return aCreatedLinks ; +} Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_ie.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fck_ie.js (revision 361) @@ -164,6 +164,13 @@ oSel.clear() ; + // Using the following trick, any comment in the begining of the HTML will + // be preserved. + html = ' ' + html ; + // Insert the HTML. oSel.createRange().pasteHTML( html ) ; + + // Remove the fake node + FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode( true ) ; FCKDocumentProcessor.Process( FCK.EditorDocument ) ; @@ -345,11 +352,9 @@ } -FCK.AttachToOnSelectionChange = function( functionPointer ) -{ - this.Events.AttachEvent( 'OnSelectionChange', functionPointer ) ; -} - FCK.CreateLink = function( url ) { + // Creates the array that will be returned. It contains one or more created links (see #220). + var aCreatedLinks = new Array() ; + // Remove any existing link in the selection. FCK.ExecuteNamedCommand( 'Unlink' ) ; @@ -357,4 +362,23 @@ if ( url.length > 0 ) { + // If there are several images, and you try to link each one, all the images get inside the link: + // -> -> due to the call to 'CreateLink' (bug in IE) + if (FCKSelection.GetType() == 'Control') + { + // Create a link + var oLink = this.EditorDocument.createElement( 'A' ) ; + oLink.href = url ; + + // Get the selected object + var oControl = FCKSelection.GetSelectedElement() ; + // Put the link just before the object + oControl.parentNode.insertBefore(oLink, oControl) ; + // Move the object inside the link + oControl.parentNode.removeChild( oControl ) ; + oLink.appendChild( oControl ) ; + + return [ oLink ] ; + } + // Generate a temporary name for the link. var sTempUrl = 'javascript:void(0);/*' + ( new Date().getTime() ) + '*/' ; @@ -375,9 +399,20 @@ oLink.href = url ; oLink.innerHTML = sInnerHtml ; // Restore the innerHTML. - return oLink ; + + // If the last child is a
move it outside the link or it will be too easy to select this link again #338 + if (oLink.lastChild.nodeName == 'BR' ) + { + // We move the br as a sibling after the link: + var oBR = oLink.lastChild ; + oLink.removeChild( oBR ) ; + // There's no insertAfter, so we insert before the next sibling + oLink.parentNode.insertBefore( oBR, oLink.nextSibling ); + } + + aCreatedLinks.push( oLink ) ; } } } - return null ; -} + return aCreatedLinks ; +} Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckbrowserinfo.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckbrowserinfo.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckbrowserinfo.js (revision 361) @@ -42,5 +42,15 @@ { var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ; - browserInfo.IsGecko10 = geckoVersion < 20051111 ; // Actually "10" refers to Gecko versions before Firefox 1.5, where Gecko 20051111 has been released. + + // Actually "10" refers to Gecko versions before Firefox 1.5, when + // Gecko 1.8 (build 20051111) has been released. + + // Some browser (like Mozilla 1.7.13) may have a Gecko build greater + // than 20051111, so we must also check for the revision number not to + // be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111). + + // TODO: Future versions may consider the rv number only, but it is + // still to check that all Gecko based browser present the rv number. + browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) || ( /rv:1\.7/.test(s) ) ) ; } else Index: /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckconfig.js =================================================================== --- /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckconfig.js (revision 360) +++ /FCKeditor/branches/versions/2.4.x/editor/_source/internals/fckconfig.js (revision 361) @@ -163,5 +163,8 @@ //

/gi + //gi, + + // Protect

+ Version 2.4.3

Version 2.4.2