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()
- {
- // To avoid JAWS putting virtual cursor back to the editor document,
- // disable main document 'contentEditable' during dialog opening.
- if ( CKEDITOR.env.ie )
- this.getParentEditor().document.getBody().$.contentEditable = 'false';
-
- // FIREFOX BUG: Force the browser to render the dialog to make the to-be-
- // inserted iframe editable. (#3366)
- this.parts.dialog.$.offsetHeight;
-
- var container = this.getContentElement( 'general', 'editing_area' ).getElement(),
- iframe = CKEDITOR.dom.element.createFromHtml( '' );
-
- var lang = this.getParentEditor().lang;
-
- iframe.setStyles(
- {
- width : '346px',
- height : '152px',
- 'background-color' : 'white',
- border : '1px solid black'
- } );
- iframe.setCustomData( 'dialog', this );
-
- var accTitle = lang.editorTitle.replace( '%1', lang.pastefromword.title );
-
- if ( CKEDITOR.env.ie )
- container.setHtml( '' );
- else
- {
- container.setHtml( '' );
- container.setAttributes(
- {
- role : 'region',
- title : accTitle
- } );
- iframe.setAttributes(
- {
- role : 'region',
- title : ' '
- } );
- }
- container.append( iframe );
- if ( CKEDITOR.env.ie )
- container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' );
-
- if ( CKEDITOR.env.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.getElementsByTag( 'iframe' ).getItem( 0 ),
- editor = this.getParentEditor(),
- html = this.definition.cleanWord( editor, iframe.$.contentWindow.document.body.innerHTML,
- this.getValueOf( 'general', 'ignoreFontFace' ),
- this.getValueOf( 'general', 'removeStyle' ) );
-
- // Insertion should happen after main document design mode turned on.
- setTimeout( function(){
- editor.insertHtml( html );
- }, 0 );
- },
- onHide : function()
- {
- if ( CKEDITOR.env.ie )
- this.getParentEditor().document.getBody().$.contentEditable = 'true';
- },
- onLoad : function()
- {
- if ( ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) && editor.lang.dir == 'rtl' )
- this.parts.contents.setStyle( 'overflow', 'hidden' );
- },
- contents :
- [
- {
- id : 'general',
- label : editor.lang.pastefromword.title,
- elements :
- [
- {
- type : 'html',
- style : 'white-space:normal;width:346px;display:block',
- 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 : '',
- focus : function()
- {
- var div = this.getElement();
- var iframe = div.getElementsByTag( 'iframe' );
- if ( iframe.count() < 1 )
- return;
- iframe = iframe.getItem( 0 );
-
- // #3291 : JAWS needs the 500ms delay to detect that the editor iframe
- // iframe is no longer editable. So that it will put the focus into the
- // Paste from Word dialog's editable area instead.
- setTimeout( function()
- {
- iframe.$.contentWindow.focus();
- }, 500 );
- }
- },
- {
- type : 'vbox',
- padding : 0,
- children :
- [
- {
- type : 'checkbox',
- id : 'ignoreFontFace',
- label : editor.lang.pastefromword.ignoreFontFace,
- 'default' : editor.config.pasteFromWordIgnoreFontFace
- },
- {
- type : 'checkbox',
- id : 'removeStyle',
- label : editor.lang.pastefromword.removeStyle,
- 'default' : editor.config.pasteFromWordRemoveStyle
- }
- ]
- }
- ]
- }
- ]
- };
-} );
Index: /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js
===================================================================
--- /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js (revision 4673)
+++ /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js (revision 4674)
@@ -3,52 +3,109 @@
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
+( function()
+{
+ CKEDITOR.plugins.add( 'pastefromword',
+ {
+ init : function( editor )
+ {
-CKEDITOR.plugins.add( 'pastefromword',
-{
- init : function( editor )
- {
- // Register the command.
- editor.addCommand( 'pastefromword', new CKEDITOR.dialogCommand( 'pastefromword' ) );
+ // Flag indicate this command is actually been asked instead of a generic
+ // pasting.
+ var forceFromWord = 0,
+ resetFromWord = function()
+ {
+ setTimeout( function()
+ {
+ forceFromWord = 0;
+ }, 0 );
+ };
- // Register the toolbar button.
- editor.ui.addButton( 'PasteFromWord',
+ // Features bring by this command beside the normal process:
+ // 1. No more bothering of user about the clean-up.
+ // 2. Perform the clean-up even if content is not from MS-Word.
+ // (e.g. from a MS-Word similar application.)
+ editor.addCommand( 'pastefromword',
{
- label : editor.lang.pastefromword.toolbar,
- command : 'pastefromword'
+ exec : function ()
+ {
+ forceFromWord = 1;
+ editor.fire( 'pasteDialog' );
+ editor.on( 'dialogHide', function ( evt )
+ {
+ evt.removeListener();
+ resetFromWord();
+ } );
+ }
} );
- // Register the dialog.
- CKEDITOR.dialog.add( 'pastefromword', this.path + 'dialogs/pastefromword.js' );
- }
-} );
+ // Register the toolbar button.
+ editor.ui.addButton( 'PasteFromWord',
+ {
+ label : editor.lang.pastefromword.toolbar,
+ command : 'pastefromword'
+ } );
+
+ editor.on( 'paste', function( evt )
+ {
+ var data = evt.data,
+ isLazyLoad,
+ mswordHtml;
+ // MS-WORD format sniffing.
+ if ( ( mswordHtml = data[ 'html' ] )
+ && ( forceFromWord || /(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test( mswordHtml ) )
+ && ( !editor.config.pasteFromWordPromptCleanup
+ || ( forceFromWord || confirm( editor.lang.pastefromword.confirmCleanup ) ) ) )
+ {
+ if( isLazyLoad = this.loadFilterRules( function()
+ {
+ // Re-continue the event with the original data.
+ if( isLazyLoad )
+ editor.fire( 'paste', data );
+ else
+ {
+ // Firefox will be confused by those downlevel-revealed IE conditional
+ // comments, fixing them first( convert it to upperlevel-revealed one ).
+ // e.g. ...
+ if( CKEDITOR.env.gecko )
+ {
+ data[ 'html' ] =
+ mswordHtml.replace( /(([\S\s]*?))/gi, '$1$2$3' );
+ }
+
+ var filter = data.processor.dataFilter;
+ // These rules will have higher priorities than default ones.
+ filter.addRules( CKEDITOR.plugins.pastefromword.getRules( editor ), 5 );
+ }
+ } ) )
+ {
+ // The filtering rules are to be loaded, it's safe to just cancel
+ // this event.
+ evt.cancel();
+ }
+ }
+ }, this );
+ },
+
+ loadFilterRules : function( callback )
+ {
+ var isLoaded = typeof CKEDITOR.plugins.pastefromword != 'undefined';
+
+ isLoaded ?
+ callback() :
+ // Load with busy indicator.
+ CKEDITOR.scriptLoader.load( this.path + 'rules.js',
+ callback, null, false, true );
+
+ return !isLoaded;
+ }
+ } );
+} )();
/**
- * Whether the "Ignore font face definitions" checkbox is enabled by default in
- * the Paste from Word dialog.
+ * Whether prompt the user about the clean-up of content from MS-Word.
+ * @name CKEDITOR.config.pasteFromWordPromptCleanup
* @type Boolean
* @default true
* @example
- * config.pasteFromWordIgnoreFontFace = false;
+ * config.pasteFromWordPromptCleanup = true;
*/
-CKEDITOR.config.pasteFromWordIgnoreFontFace = true;
-
-/**
- * Whether the "Remove styles definitions" checkbox is enabled by default in
- * the Paste from Word dialog.
- * @type Boolean
- * @default false
- * @example
- * config.pasteFromWordRemoveStyle = true;
- */
-CKEDITOR.config.pasteFromWordRemoveStyle = false;
-
-/**
- * Whether to keep structure markup (<h1>, <h2>, etc.) or replace
- * it with elements that create more similar pasting results when pasting
- * content from Microsoft Word into the Paste from Word dialog.
- * @type Boolean
- * @default false
- * @example
- * config.pasteFromWordKeepsStructure = true;
- */
-CKEDITOR.config.pasteFromWordKeepsStructure = false;
Index: /CKEditor/branches/features/paste/_source/plugins/pastefromword/rules.js
===================================================================
--- /CKEditor/branches/features/paste/_source/plugins/pastefromword/rules.js (revision 4674)
+++ /CKEditor/branches/features/paste/_source/plugins/pastefromword/rules.js (revision 4674)
@@ -0,0 +1,931 @@
+( function()
+{
+ var fragmentPrototype = CKEDITOR.htmlParser.fragment.prototype,
+ elementPrototype = CKEDITOR.htmlParser.element.prototype;
+
+ fragmentPrototype.onlyChild = elementPrototype.onlyChild = function()
+ {
+ var children = this.children,
+ count = children.length,
+ firstChild = ( count == 1 ) && children[ 0 ];
+ return firstChild || null;
+ };
+
+ elementPrototype.removeAnyChildWithName = function( tagName )
+ {
+ var children = this.children,
+ childs = [],
+ child;
+
+ for ( var i = 0; i < children.length; i++ )
+ {
+ child = children[ i ];
+ if( !child.name )
+ continue;
+
+ if( child.name == tagName )
+ {
+ childs.push( child );
+ children.splice( i--, 1 );
+ }
+ childs = childs.concat( child.removeAnyChildWithName( tagName ) );
+ }
+ return childs;
+ };
+
+ elementPrototype.getAncestor = function( tagNameRegex )
+ {
+ var parent = this.parent;
+ while( parent && !( parent.name && parent.name.match( tagNameRegex ) ) )
+ parent = parent.parent;
+ return parent;
+ };
+
+ fragmentPrototype.firstTextChild = elementPrototype.firstTextChild = function()
+ {
+ var child;
+ for( var i = 0 ; i < this.children.length ; i++ )
+ {
+ child = this.children[ i ];
+ if( child.value )
+ return child;
+ else if( child.name )
+ {
+ child = child.firstTextChild();
+ if( child )
+ return child;
+ else
+ continue;
+ }
+ }
+ };
+
+ // Adding a (set) of styles to the element's attributes.
+ elementPrototype.addStyle = function( name, value, isPrepend )
+ {
+ var styleText, addingStyleText = '';
+ // name/value pair.
+ if ( typeof value == 'string' )
+ addingStyleText += name + ':' + value + ';';
+ else
+ {
+ // style literal.
+ if( typeof name == 'object' )
+ {
+ for( var style in name )
+ {
+ if( name.hasOwnProperty( style) )
+ addingStyleText += style + ':' + name[ style ] + ';';
+ }
+ // Avoid CKPackager produce buggy output (#4695)
+ // TODO: Remove after CKPackager get fixed.
+ ;
+ }
+ // raw style text form.
+ else
+ addingStyleText += name;
+ isPrepend = value;
+ }
+
+ if( !this.attributes )
+ this.attributes = {};
+
+ styleText = this.attributes.style || '';
+
+ styleText = ( isPrepend ?
+ [ addingStyleText, styleText ]
+ : [ styleText, addingStyleText ] ).join( ';' );
+
+ this.attributes.style = styleText.replace( /^;|;(?=;)/, '' );
+ };
+
+ /**
+ * Return the DTD-valid parent tag names of the specified one.
+ * @param tagName
+ */
+ CKEDITOR.dtd.parentOf = function( tagName )
+ {
+ var result = {};
+ for( var tag in this )
+ {
+ if( tag.indexOf( '$' ) == -1 && this[ tag ][ tagName ] )
+ result[ tag ] = 1;
+ }
+ return result;
+ };
+
+ var cssLengthRelativeUnit = /^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
+
+ CKEDITOR.plugins.pastefromword =
+ {
+ utils :
+ {
+ // Create a which indicate an list item type.
+ createListBulletMarker : function ( bulletStyle, bulletText )
+ {
+ var marker = new CKEDITOR.htmlParser.element( 'cke:listbullet' ),
+ listType;
+
+ // TODO: Support more list style type from MS-Word.
+ if( !bulletStyle )
+ {
+ bulletStyle = 'decimal';
+ listType = 'ol';
+ }
+ else if ( bulletStyle[ 2 ] )
+ {
+ if ( !isNaN( bulletStyle[ 1 ] ) )
+ bulletStyle = 'decimal';
+ // No way to distinguish between Roman numerals and Alphas,
+ // detect them as a whole.
+ else if ( /^[a-z]+$/.test( bulletStyle[ 1 ] ) )
+ bulletStyle = 'lower-alpha';
+ else if ( /^[A-Z]+$/.test( bulletStyle[ 1 ] ) )
+ bulletStyle = 'upper-alpha';
+ // Simply use decimal for the rest forms of unrepresentable
+ // numerals, e.g. Chinese...
+ else
+ bulletStyle = 'decimal';
+
+ listType = 'ol';
+ }
+ else
+ {
+ if ( /[l\u00B7\u2002]/.test( bulletStyle[ 1 ] ) ) //l·•
+ bulletStyle = 'disc';
+ else if ( /[\u006F\u00D8]/.test( bulletStyle[ 1 ] ) ) //oØ
+ bulletStyle = 'circle';
+ else if ( /[\u006E\u25C6]/.test( bulletStyle[ 1 ] ) ) //n◆
+ bulletStyle = 'square';
+ else
+ bulletStyle = 'disc';
+
+ listType = 'ul';
+ }
+
+ // Represent list type as CSS style.
+ marker.attributes =
+ {
+ 'cke:listtype' : listType,
+ 'style' : 'list-style-type:' + bulletStyle + ';'
+ };
+ marker.add( new CKEDITOR.htmlParser.text( bulletText ) );
+ return marker;
+ },
+
+ isListBulletIndicator : function( element )
+ {
+ var styleText = element.attributes && element.attributes.style;
+ if( /mso-list\s*:\s*Ignore/i.test( styleText ) )
+ return true;
+ },
+
+ isContainingOnlySpaces : function( element )
+ {
+ var text;
+ return ( ( text = element.onlyChild() )
+ && /^(:?\s| )+$/.test( text.value ) );
+ },
+
+ resolveList : function( element )
+ {
+ // indicate a list item.
+ var children = element.children,
+ attrs = element.attributes,
+ listMarker;
+ if( ( listMarker = element.removeAnyChildWithName( 'cke:listbullet' ) )
+ && listMarker.length
+ && ( listMarker = listMarker[ 0 ] ) )
+ {
+ element.name = 'cke:li';
+
+ if( attrs.style )
+ {
+ attrs.style = CKEDITOR.plugins.pastefromword.filters.stylesFilter(
+ [
+ // Text-indent is not representing list item level any more.
+ [ 'text-indent' ],
+ [ 'line-height' ],
+ // Resolve indent level from 'margin-left' value.
+ [ /^margin(:?-left)?$/, null, function( value )
+ {
+ // Be able to deal with component/short-hand form style.
+ var values = value.split( ' ' );
+ value = values[ 3 ] || values[ 1 ] || values [ 0 ];
+ attrs[ 'cke:indent' ] = parseInt( value );
+ } ]
+ ] )( attrs.style, element ) || '' ;
+ }
+
+ // Inherit list-type-style from bullet.
+ var listBulletAttrs = listMarker.attributes,
+ listBulletStyle = listBulletAttrs.style;
+
+ element.addStyle( listBulletStyle );
+ CKEDITOR.tools.extend( attrs, listBulletAttrs );
+ return true;
+ }
+ },
+
+ convertToPx : function( cssLength )
+ {
+ // Convert to 'px' in ignorance of DPI.
+ if( cssLengthRelativeUnit.test( cssLength ) )
+ {
+ var val,
+ calculator = CKEDITOR.dom.element.createFromHtml(
+ '' );
+ CKEDITOR.document.getBody().append( calculator );
+ val = calculator.$.clientWidth;
+ calculator.remove();
+ return val + 'px';
+ }
+ return cssLength;
+ },
+
+ listDtdParents : CKEDITOR.dtd.parentOf( 'ol' )
+ },
+
+ filters :
+ {
+ // Transform a normal list into flat list items only presentation.
+ // E.g.
- level1
- level2
=>
+ //