Index: /FCKeditor/branches/developers/alfonsoml/_whatsnew.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/_whatsnew.html (revision 56) +++ /FCKeditor/branches/developers/alfonsoml/_whatsnew.html (revision 57) @@ -52,20 +52,26 @@ the inner folder for each type (file, image, flash and media) are all lower-cased too. -
  • [SF +
  • [SF 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 +
  • [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 +
  • [SF Feature-1587175] Local links to an anchor are readjusted if the anchor changes.
    • -
  • [SF +
  • [SF PATCH-1500040] New configuration values to specify the Id and Class for the body element.
    • -
  • [SF +
  • [SF PATCH-1577202] The links created with the popup option now are accesible even if the user has javascript disabled.
    • +
  • [SF + PATCH-1443472] [SF + BUG-1576488] [SF + BUG-1334305] [SF + BUG-1578312] The Paste from Word clean up function can be configured with FCKConfig.CleanWordKeepStructure to preserve + the markup as much as possible. Thanks Jean-Charles ROGEZ.
    • @@ -82,5 +88,6 @@ be used.
  • [SF - BUG-1573714] Paste was not working in IE if both AutoDetectPasteFromWord and + BUG-1573714] [SF + BUG-1593323] Paste was not working in IE if both AutoDetectPasteFromWord and ForcePasteAsPlainText settings were set to "false".
  • [SF @@ -101,5 +108,6 @@
  • Depending on the implementation of toolbar combos (mainly for custom plugins) the editor area was loosing the focus when clicking in the combo label. Fixed.
    • -
  • InsertHtml() was inserting the HTML outside the editor area on some very specific +
  • [SF + BUG-1596937] InsertHtml() was inserting the HTML outside the editor area on some very specific cases.
  • [SF @@ -119,5 +127,6 @@ menus. Fixed.
  • [SF - BUG-1526154] With Firefox, <style> tags defined in the source are now + BUG-1526154] [SF + BUG-1509208] With Firefox, <style> tags defined in the source are now preserved.
  • [SF Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js (revision 56) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js (revision 57) @@ -99,4 +99,7 @@ var oNode ; + if ( !FCK.EditorDocument ) + return null ; + if ( FCK.EditorDocument.selection.type == "Control" ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js (revision 56) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js (revision 57) @@ -200,2 +200,109 @@ return new fCloneCreator ; } + +// This function will be called from the PasteFromWord dialog (fck_paste.html) +// Input: oNode a DOM node that contains the raw paste from the clipboard +// bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog +// Output: the cleaned string +FCKTools.CleanWord = function( oNode, bIgnoreFont, bRemoveStyles ) +{ + var html = oNode.innerHTML ; + + html = html.replace(/\s*<\/o:p>/g, '') ; + html = html.replace(/.*?<\/o:p>/g, ' ') ; + + // Remove mso-xxx styles. + html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ; + + // Remove margin styles. + html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ; + html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ; + + html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ; + html = html.replace( /\s*TEXT-INDENT: 0cm\s*"/gi, "\"" ) ; + + html = html.replace( /\s*TEXT-ALIGN: [^\s;]+;?"/gi, "\"" ) ; + + html = html.replace( /\s*PAGE-BREAK-BEFORE: [^\s;]+;?"/gi, "\"" ) ; + + html = html.replace( /\s*FONT-VARIANT: [^\s;]+;?"/gi, "\"" ) ; + + html = html.replace( /\s*tab-stops:[^;"]*;?/gi, '' ) ; + html = html.replace( /\s*tab-stops:[^"]*/gi, '' ) ; + + // Remove FONT face attributes. + if ( bIgnoreFont ) + { + html = html.replace( /\s*face="[^"]*"/gi, '' ) ; + html = html.replace( /\s*face=[^ >]*/gi, '' ) ; + + html = html.replace( /\s*FONT-FAMILY:[^;"]*;?/gi, '' ) ; + } + + // Remove Class attributes + html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ; + + // Remove styles. + if ( bRemoveStyles ) + html = html.replace( /<(\w[^>]*) style="([^\"]*)"([^>]*)/gi, "<$1$3" ) ; + + // Remove empty styles. + html = html.replace( /\s*style="\s*"/gi, '' ) ; + + html = html.replace( /]*>\s* \s*<\/SPAN>/gi, ' ' ) ; + + html = html.replace( /]*><\/SPAN>/gi, '' ) ; + + // Remove Lang attributes + html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ; + + html = html.replace( /(.*?)<\/SPAN>/gi, '$1' ) ; + + html = html.replace( /(.*?)<\/FONT>/gi, '$1' ) ; + + // Remove XML elements and declarations + html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ; + + // Remove Tags with XML namespace declarations: <\/o:p> + html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ; + + // Remove comments [SF BUG-1481861]. + html = html.replace(/<\!--.*-->/g, '' ) ; + + html = html.replace( /<(U|I|STRIKE)> <\/\1>/g, ' ' ) ; + + html = html.replace( /\s*<\/H\d>/gi, '' ) ; + + if ( FCKConfig.CleanWordKeepsStructure ) + { + // The original tag send from Word is something like this: + html = html.replace( /]*)>/gi, '' ) ; + + // Word likes to insert extra tags, when using MSIE. (Wierd). + html = html.replace( /<(H\d)>]*>(.*?)<\/FONT><\/\1>/gi, '<$1>$2' ); + html = html.replace( /<(H\d)>(.*?)<\/EM><\/\1>/gi, '<$1>$2' ); + } + else + { + html = html.replace( /]*)>/gi, '' ) ; + html = html.replace( /]*)>/gi, '' ) ; + html = html.replace( /]*)>/gi, '' ) ; + html = html.replace( /]*)>/gi, '' ) ; + html = html.replace( /]*)>/gi, '' ) ; + html = html.replace( /]*)>/gi, '' ) ; + + html = html.replace( /<\/H\d>/gi, '<\/font><\/b><\/div>' ) ; + + // Transform

    to

    + var re = new RegExp( '(]*>.*?)(<\/P>)', 'gi' ) ; // Different because of a IE 5.0 error + html = html.replace( re, '' ) ; + + // Remove empty tags (three times, just to be sure). + // This also removes any empty anchor + html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ; + html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ; + html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ; + } + + return html ; +} Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html (revision 56) +++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html (revision 57) @@ -15,4 +15,6 @@