Index: /FCKeditor/branches/features/dataprocessor/_dev/releaser/fckreleaser.php =================================================================== --- /FCKeditor/branches/features/dataprocessor/_dev/releaser/fckreleaser.php (revision 244) +++ /FCKeditor/branches/features/dataprocessor/_dev/releaser/fckreleaser.php (revision 245) @@ -349,5 +349,5 @@ function StrEndsWith( $str, $sub ) { - return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ; + return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ; } @@ -363,5 +363,5 @@ { $dirParts = explode( '/', $path ) ; - + $currentDir = '' ; @@ -369,5 +369,5 @@ { $currentDir .= $dirPart . '/' ; - + if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) ) mkdir( $currentDir, $rights ) ; @@ -385,22 +385,5 @@ fwrite( $f, "\xEF\xBB\xBF" ) ; // BOM - fwrite( $f, $strData ) ; - fclose( $f ) ; - - return TRUE ; -} - -function SaveStringToUtf8File( $strData, $filePath, $includeBom = TRUE ) -{ - $f = @fopen( $filePath, 'wb' ) ; - - if ( !$f ) - return FALSE ; - - if ( $includeBom ) - fwrite( $f, "\xEF\xBB\xBF" ) ; // BOM - - fwrite( $f, ( $strData ) ) ; - + fwrite( $f, StripUtf8Bom( $strData ) ) ; fclose( $f ) ; @@ -954,8 +937,8 @@ function ProcessFile( $sourceFilePath, $destinationFilePath, $onlyHeader = FALSE ) { - SaveStringToUtf8File( + SaveStringToFile( FCKPreProcessor::Process( file_get_contents( $sourceFilePath ), $onlyHeader ), $destinationFilePath, - ( !StrEndsWith( $sourceFilePath, '.asp' ) && !StrEndsWith( $sourceFilePath, '.js' ) ) ) ; // Only ASP and JavaScript files require the BOM. + ( StrEndsWith( $sourceFilePath, '.asp' ) || StrEndsWith( $sourceFilePath, '.js' ) ) ) ; // Only ASP and JavaScript files require the BOM. // Set the destination file Last Access and Last Write times. Index: /FCKeditor/branches/features/dataprocessor/_whatsnew.html =================================================================== --- /FCKeditor/branches/features/dataprocessor/_whatsnew.html (revision 244) +++ /FCKeditor/branches/features/dataprocessor/_whatsnew.html (revision 245) @@ -31,5 +31,33 @@

- Version 2.4.1 (SVN)

+ Version 2.4.3 (SVN) +

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.4.2

+

+ Fixed Bugs:

+ +

+ Version 2.4.1

New Features and Improvements:

Index: /FCKeditor/branches/features/dataprocessor/editor/_source/classes/fckdataprocessor.js =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/_source/classes/fckdataprocessor.js (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/_source/classes/fckdataprocessor.js (revision 245) @@ -45,7 +45,4 @@ ConvertToHtml : function( data ) { - // Protect event attributes (they could get fired in the editing area). - data = this._ProtectEvents( data ) ; - // The default data processor must handle two different cases depending // on the FullPage setting. Custom Data Processors will not be @@ -116,7 +113,4 @@ return '' ; - // Restore protected event attributes. - data = this._ProtectEventsRestore( data ) ; - return data ; }, @@ -128,36 +122,6 @@ */ FixHtml : function( html ) - {}, - - // Saves event attributes (like onclick) so they don't get executed while - // editing. - _ProtectEvents : function( html ) { - return html.replace( FCKRegexLib.TagsWithEvent, _FCKDataProcessor_ProtectEvents_ReplaceTags ) ; - }, - - _ProtectEventsRestore : function( html ) - { - return html.replace( FCKRegexLib.ProtectedEvents, _FCKDataProcessor_ProtectEvents_RestoreEvents ) ; + return html ; } } ; - -// Replace all events attributes (like onclick). -function _FCKDataProcessor_ProtectEvents_ReplaceTags( tagMatch ) -{ - return tagMatch.replace( FCKRegexLib.EventAttributes, _FCKDataProcessor_ProtectEvents_ReplaceEvents ) ; -} - -// Replace an event attribute with its respective __fckprotectedatt attribute. -// The original event markup will be encoded and saved as the value of the new -// attribute. -function _FCKDataProcessor_ProtectEvents_ReplaceEvents( eventMatch, attName ) -{ - return ' ' + attName + '_fckprotectedatt="' + eventMatch.ReplaceAll( [/&/g,/'/g,/"/g,/=/g,//g,/\r/g,/\n/g], [''',''','"','=','<','>',' ',' '] ) + '"' ; -} - -function _FCKDataProcessor_ProtectEvents_RestoreEvents( match, encodedOriginal ) -{ - return encodedOriginal.ReplaceAll( [/'/g,/"/g,/=/g,/</g,/>/g,/ /g,/ /g,/'/g], ["'",'"','=','<','>','\r','\n','&'] ) ; -} - Index: /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck.js (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck.js (revision 245) @@ -214,4 +214,7 @@ format ) ; + // Restore protected attributes. + data = FCK.ProtectEventsRestore( data ) ; + if ( FCKBrowserInfo.IsIE ) data = data.replace( FCKRegexLib.ToReplace, '$1' ) ; @@ -272,4 +275,16 @@ }, + // Saves event attributes (like onclick) so they don't get executed while + // editing. + ProtectEvents : function( html ) + { + return html.replace( FCKRegexLib.TagsWithEvent, _FCK_ProtectEvents_ReplaceTags ) ; + }, + + ProtectEventsRestore : function( html ) + { + return html.replace( FCKRegexLib.ProtectedEvents, _FCK_ProtectEvents_RestoreEvents ) ; + }, + ProtectTags : function( html ) { @@ -279,5 +294,5 @@ if ( FCKBrowserInfo.IsIE ) sTags += sTags.length > 0 ? '|ABBR' : 'ABBR' ; - + var oRegex ; if ( sTags.length > 0 ) @@ -289,5 +304,5 @@ html = html.replace( oRegex, '<\/FCK:$1>' ) ; } - + // Protect some empty elements. We must do it separately becase the // original tag may not contain the closing slash, like
: @@ -325,5 +340,8 @@ // Fix for invalid self-closing tags (see #152). data = data.replace( FCKRegexLib.InvalidSelfCloseTags, '$1>' ) ; - + + // Protect event attributes (they could get fired in the editing area). + data = FCK.ProtectEvents( data ) ; + // Protect some things from the browser itself. data = FCK.ProtectUrls( data ) ; @@ -570,4 +588,23 @@ FCK.SetHTML = FCK.SetData ; +// Replace all events attributes (like onclick). +function _FCK_ProtectEvents_ReplaceTags( tagMatch ) +{ + return tagMatch.replace( FCKRegexLib.EventAttributes, _FCK_ProtectEvents_ReplaceEvents ) ; +} + +// Replace an event attribute with its respective __fckprotectedatt attribute. +// The original event markup will be encoded and saved as the value of the new +// attribute. +function _FCK_ProtectEvents_ReplaceEvents( eventMatch, attName ) +{ + return ' ' + attName + '_fckprotectedatt="' + eventMatch.ReplaceAll( [/&/g,/'/g,/"/g,/=/g,//g,/\r/g,/\n/g], [''',''','"','=','<','>',' ',' '] ) + '"' ; +} + +function _FCK_ProtectEvents_RestoreEvents( match, encodedOriginal ) +{ + return encodedOriginal.ReplaceAll( [/'/g,/"/g,/=/g,/</g,/>/g,/ /g,/ /g,/'/g], ["'",'"','=','<','>','\r','\n','&'] ) ; +} + function _FCK_EditingArea_OnLoad() { Index: /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_gecko.js (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_gecko.js (revision 245) @@ -155,8 +155,8 @@ // Firefox can't handle correctly the editing of the STRONG and EM tags. // We must replace them with B and I. - html = html.replace( FCKRegexLib.StrongOpener, '' ) ; - html = html.replace( FCKRegexLib.EmOpener, '' ) ; + html = html.replace( FCKRegexLib.StrongOpener, '' ) ; + html = html.replace( FCKRegexLib.EmOpener, '' ) ; // Delete the actual selection. Index: /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_ie.js (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/_source/internals/fck_ie.js (revision 245) @@ -357,4 +357,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() ) + '*/' ; Index: /FCKeditor/branches/features/dataprocessor/editor/css/fck_internal.css =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/css/fck_internal.css (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/css/fck_internal.css (revision 245) @@ -43,5 +43,5 @@ .FCK__Flash { - border: darkgray 1px solid; + border: #a9a9a9 1px solid; background-position: center center; background-image: url(images/fck_flashlogo.gif); @@ -67,5 +67,5 @@ { border: 1px dotted #00F; - background-position: 1 center; + background-position: 1px center; background-image: url(images/fck_anchor.gif); background-repeat: no-repeat; Index: /FCKeditor/branches/features/dataprocessor/editor/dialog/fck_listprop.html =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/dialog/fck_listprop.html (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/dialog/fck_listprop.html (revision 245) @@ -61,5 +61,5 @@ { if ( oActiveEl.getAttribute('type') ) - oActiveSel.value = oActiveEl.getAttribute('type').toLowerCase() ; + oActiveSel.value = oActiveEl.getAttribute('type') ; } Index: /FCKeditor/branches/features/dataprocessor/editor/plugins/bbcode/fckplugin.js =================================================================== --- /FCKeditor/branches/features/dataprocessor/editor/plugins/bbcode/fckplugin.js (revision 244) +++ /FCKeditor/branches/features/dataprocessor/editor/plugins/bbcode/fckplugin.js (revision 245) @@ -100,5 +100,7 @@ */ FixHtml : function( html ) - {} + { + return html ; + } } ;