Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 3082) +++ /CKEditor/trunk/_source/core/config.js (revision 3083) @@ -148,5 +148,5 @@ */ - plugins : 'basicstyles,blockquote,button,elementspath,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,newpage,pagebreak,preview,print,removeformat,smiley,sourcearea,table,specialchar,tab,toolbar,wysiwygarea', + plugins : 'basicstyles,blockquote,button,elementspath,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,newpage,pagebreak,pastefromword,preview,print,removeformat,smiley,sourcearea,table,specialchar,tab,toolbar,wysiwygarea', /** Index: /CKEditor/trunk/_source/lang/en.js =================================================================== --- /CKEditor/trunk/_source/lang/en.js (revision 3082) +++ /CKEditor/trunk/_source/lang/en.js (revision 3083) @@ -391,4 +391,13 @@ outdent : 'Decrease Indent', - blockquote : 'Blockquote' + blockquote : 'Blockquote', + + pastefromword : + { + toolbar : 'Paste from Word', + title : 'Paste from Word', + advice : 'Please paste inside the following box using the keyboard (Ctrl+V) and hit OK.', + ignoreFontFace : 'Ignore Font Face definitions', + removeStyle : 'Remove Styles definitions' + } }; Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3082) +++ /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3083) @@ -2084,15 +2084,15 @@ onLoad : function( dialog, func ) { - dialog.on( 'load', func ); + dialog.on( 'load', func, this ); }, onShow : function( dialog, func ) { - dialog.on( 'show', func ); + dialog.on( 'show', func, this ); }, onHide : function( dialog, func ) { - dialog.on( 'hide', func ); + dialog.on( 'hide', func, this ); } }, Index: /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3083) +++ /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3083) @@ -0,0 +1,238 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.dialog.add( 'pastefromword', function( editor ) +{ + return { + title : editor.lang.pastefromword.title, + minWidth : 400, + minHeight : 340, + htmlToLoad : '', + cleanWord : function( editor, html, ignoreFont, removeStyles ) + { + html = html.replace(/\s*<\/o:p>/g, '') ; + html = html.replace(/[\s\S]*?<\/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 ( ignoreFont ) + { + 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 ( removeStyles ) + html = html.replace( /<(\w[^>]*) style="([^\"]*)"([^>]*)/gi, "<$1$3" ) ; + + // Remove style, meta and link tags + html = html.replace( /]*>[\s\S]*?<\/STYLE[^>]*>/gi, '' ) ; + html = html.replace( /<(?:META|LINK)[^>]*>\s*/gi, '' ) ; + + // 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( /([\s\S]*?)<\/SPAN>/gi, '$1' ) ; + + html = html.replace( /([\s\S]*?)<\/FONT>/gi, '$1' ) ; + + // Remove XML elements and declarations + html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ; + + // Remove w: tags with contents. + html = html.replace( /]*>[\s\S]*?<\/w:[^>]*>/gi, '' ) ; + + // Remove Tags with XML namespace declarations: <\/o:p> + html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ; + + // Remove comments [SF BUG-1481861]. + html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ; + + html = html.replace( /<(U|I|STRIKE)> <\/\1>/g, ' ' ) ; + + html = html.replace( /\s*<\/H\d>/gi, '' ) ; + + // Remove "display:none" tags. + html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none[\s\S]*?<\/\1>/ig, '' ) ; + + // Remove language tags + html = html.replace( /<(\w[^>]*) language=([^ |>]*)([^>]*)/gi, "<$1$3") ; + + // Remove onmouseover and onmouseout events (from MS Word comments effect) + html = html.replace( /<(\w[^>]*) onmouseover="([^\"]*)"([^>]*)/gi, "<$1$3") ; + html = html.replace( /<(\w[^>]*) onmouseout="([^\"]*)"([^>]*)/gi, "<$1$3") ; + + if ( editor.config.pasteFromWordKeepsStructure ) + { + // 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)>]*>([\s\S]*?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' ); + html = html.replace( /<(H\d)>([\s\S]*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' ); + } + 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( '(]*>[\\s\\S]*?)(<\/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 ; + }, + onShow : function() + { + var container = this.getContentElement( 'general', 'editing_area' ).getElement(), + iframe = CKEDITOR.dom.element.createFromHtml( '' ); + + iframe.setStyles( + { + width : '346px', + height : '152px', + 'background-color' : 'white', + border : '1px solid black' + } ); + container.setHtml( '' ); + container.append( iframe ); + if ( CKEDITOR.env.ie ) + container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' ); + + var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname; + if ( isCustomDomain ) + { + CKEDITOR._cke_htmlToLoad = this.definition.htmlToLoad; + iframe.setAttribute( 'src', + 'javascript:void( (function(){' + + 'document.open();' + + 'document.domain="' + document.domain + '";' + + 'document.write( window.parent.CKEDITOR._cke_htmlToLoad );' + + 'delete window.parent.CKEDITOR._cke_htmlToLoad;' + + 'document.close();' + + '})() )' ); + } + else + { + var doc = iframe.$.contentWindow.document; + doc.open(); + doc.write( this.definition.htmlToLoad ); + doc.close(); + } + }, + onOk : function() + { + var container = this.getContentElement( 'general', 'editing_area' ).getElement(), + iframe = container.getFirst(), + editor = this.getParentEditor(), + html = this.definition.cleanWord( editor, iframe.$.contentWindow.document.body.innerHTML, + this.getValueOf( 'general', 'ignoreFontFace' ), + this.getValueOf( 'general', 'removeStyle' ) ); + + this.restoreSelection(); + editor.insertHtml( html ); + }, + contents : + [ + { + id : 'general', + label : editor.lang.pastefromword.title, + elements : + [ + { + type : 'html', + style : 'white-space: normal;', + onShow : function() + { + /* + * SAFARI BUG: The advice label would overflow if the table layout + * isn't fixed. + */ + if ( CKEDITOR.env.webkit ) + this.getElement().getAscendant( 'table' ).setStyle( 'table-layout', 'fixed' ); + }, + html : editor.lang.pastefromword.advice + }, + { + type : 'html', + id : 'editing_area', + style : 'width: 100%; height: 100%;', + html : '
 
' + }, + { + type : 'vbox', + padding : 0, + children : + [ + { + type : 'checkbox', + id : 'ignoreFontFace', + label : editor.lang.pastefromword.ignoreFontFace, + 'default' : true + }, + { + type : 'checkbox', + id : 'removeStyle', + label : editor.lang.pastefromword.removeStyle + } + ] + } + ] + } + ] + }; +} ); Index: /CKEditor/trunk/_source/plugins/pastefromword/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/plugin.js (revision 3083) +++ /CKEditor/trunk/_source/plugins/pastefromword/plugin.js (revision 3083) @@ -0,0 +1,27 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.plugins.add( 'pastefromword', +{ + init : function( editor ) + { + // Register the command. + editor.addCommand( 'pastefromword', new CKEDITOR.dialogCommand( 'pastefromword' ) ); + + // Register the toolbar button. + editor.ui.addButton( 'PasteFromWord', + { + label : editor.lang.pastefromword.toolbar, + command : 'pastefromword' + } ); + + // Register the dialog. + CKEDITOR.dialog.add( 'pastefromword', this.path + 'dialogs/pastefromword.js' ); + } +} ); + +CKEDITOR.config.pasteFromWordIgnoreFontFace = true; +CKEDITOR.config.pasteFromWordRemoveStyle = false; +CKEDITOR.config.pasteFromWordKeepsStructure = false; Index: /CKEditor/trunk/_source/plugins/toolbar/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 3082) +++ /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 3083) @@ -209,4 +209,5 @@ 'Source', '-', 'NewPage', 'Preview', 'Print', '-', + 'PasteFromWord', '-', 'Bold', 'Italic', 'Underline', 'Strike', '-', 'NumberedList', 'BulletedList', '-', Index: /CKEditor/trunk/_source/skins/default/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/default/toolbar.css (revision 3082) +++ /CKEditor/trunk/_source/skins/default/toolbar.css (revision 3083) @@ -356,2 +356,7 @@ background-position: 0 -1152px; } + +.cke_skin_default a.cke_button_pastefromword .cke_icon +{ + background-position: 0 -160px; +}