+ 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 ;
+ }
+
+ CKEDITOR.dialog.add( 'pastefromword', function( editor )
+ {
+ return {
+ title : editor.lang.pastefromword.title,
+ minWidth : 400,
+ minHeight : 340,
+ 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 )
+ {
+ iframe.setAttribute( 'src',
+ 'javascript:void( (function(){' +
+ 'document.open();' +
+ 'document.domain="' + document.domain + '";' +
+ 'document.write( window.parent.CKEDITOR.plugins.pastefromword.htmlToLoad );' +
+ 'document.close();' +
+ '})() )' );
+ }
+ else
+ {
+ var doc = iframe.$.contentWindow.document;
+ doc.open();
+ doc.write( CKEDITOR.plugins.pastefromword.htmlToLoad );
+ doc.close();
+ }
+ },
+ onOk : function()
+ {
+ var container = this.getContentElement( 'general', 'editing_area' ).getElement(),
+ iframe = container.getFirst(),
+ editor = this.getParentEditor(),
+ html = 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: _source/plugins/pastefromword/plugin.js
===================================================================
--- _source/plugins/pastefromword/plugin.js (revision 0)
+++ _source/plugins/pastefromword/plugin.js (revision 0)
@@ -0,0 +1,44 @@
+/*
+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.tools.extend( CKEDITOR.config,
+{
+ pasteFromWordIgnoreFontFace : true,
+ pasteFromWordRemoveStyle : false,
+ pasteFromWordKeepsStructure : false
+} );
+
+CKEDITOR.plugins.pastefromword =
+{
+ htmlToLoad : ''
+};
Index: _source/plugins/dialog/plugin.js
===================================================================
--- _source/plugins/dialog/plugin.js (revision 3068)
+++ _source/plugins/dialog/plugin.js (working copy)
@@ -2083,17 +2083,17 @@
{
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: _source/plugins/toolbar/plugin.js
===================================================================
--- _source/plugins/toolbar/plugin.js (revision 3068)
+++ _source/plugins/toolbar/plugin.js (working copy)
@@ -208,6 +208,7 @@
[
'Source', '-',
'NewPage', 'Preview', '-',
+ 'PasteFromWord', '-',
'Bold', 'Italic', 'Underline', 'Strike', '-',
'NumberedList', 'BulletedList', '-',
'Outdent', 'Indent', 'Blockquote', '-',
Index: _source/skins/default/toolbar.css
===================================================================
--- _source/skins/default/toolbar.css (revision 3068)
+++ _source/skins/default/toolbar.css (working copy)
@@ -355,3 +355,8 @@
{
background-position: 0 -1152px;
}
+
+.cke_skin_default a.cke_button_pastefromword .cke_icon
+{
+ background-position: 0 -160px;
+}
Index: _source/core/config.js
===================================================================
--- _source/core/config.js (revision 3068)
+++ _source/core/config.js (working copy)
@@ -147,7 +147,7 @@
* config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
*/
- plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,justify,blockquote,sourcearea,table,specialchar,tab,toolbar,wysiwygarea',
+ plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,preview,removeformat,smiley,indent,link,list,justify,blockquote,pastefromword,sourcearea,table,specialchar,tab,toolbar,wysiwygarea',
/**
* The theme to be used to build the UI.