Index: /CKEditor/branches/features/paste/_source/plugins/clipboard/plugin.js =================================================================== --- /CKEditor/branches/features/paste/_source/plugins/clipboard/plugin.js (revision 4701) +++ /CKEditor/branches/features/paste/_source/plugins/clipboard/plugin.js (revision 4702) @@ -78,6 +78,6 @@ // Paste command. - var pasteCmd = - CKEDITOR.env.ie ? + var pasteCmd = CKEDITOR.tools.extend( { canUndo: false }, + CKEDITOR.env.ie ? { exec : function( editor, data ) @@ -85,5 +85,5 @@ // Prevent IE from pasting at the begining of the document. editor.focus(); - + if ( !editor.document.getBody().fire( 'beforepaste' ) && !execIECommand( editor, 'paste' ) ) @@ -115,5 +115,5 @@ } } - }; + } ); // Listens for some clipboard related keystrokes, so they get customized. @@ -129,8 +129,5 @@ case CKEDITOR.SHIFT + 45 : // SHIFT+INS - var editor = this, - body = editor.document.getBody(); - - editor.fire( 'saveSnapshot' ); // Save before paste + var body = this.document.getBody(); // Simulate 'beforepaste' event for all none-IEs. @@ -148,6 +145,6 @@ // Save Undo snapshot. - editor = this; - editor.fire( 'saveSnapshot' ); // Save before paste + var editor = this; + this.fire( 'saveSnapshot' ); // Save before paste setTimeout( function() { @@ -246,40 +243,12 @@ init : function( editor ) { - // The paste processor here is just a reduced copy of html data processor. - CKEDITOR.pasteProcessor = function( editor ) - { - this.editor = editor; - this.dataFilter = new CKEDITOR.htmlParser.filter(); - }; - CKEDITOR.pasteProcessor.prototype = - { - toHtml : function( data ) - { - var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, false ), - writer = new CKEDITOR.htmlParser.basicWriter(); - - fragment.writeHtml( writer, this.dataFilter ); - return writer.getHtml( true ); - } - }; - - // The very first handler which initialize the processor. + + // Inserts processed data into the editor at the end of the + // events chain. editor.on( 'paste', function( evt ) { - // The processor is a transient instance life cycled to the - // 'paste' event since the processing rules will be added - // on demand accordingly to clipboard data flavor. - evt.data.processor = new CKEDITOR.pasteProcessor( editor ); - - }, null, null, 1 ); - - // The very last handler which insert final data into the editor at the end of the chain. - editor.on( 'paste', function( evt ) - { - var data = evt.data, - processor = data.processor; - + var data = evt.data; if ( data[ 'html' ] ) - editor.insertHtml( processor.toHtml( data[ 'html' ], false ) ); + editor.insertHtml( data[ 'html' ] ); else if ( data[ 'text' ] ) editor.insertText( data[ 'text' ] ); @@ -328,4 +297,8 @@ var mode = editor.config.forcePasteAsPlainText ? 'text' : 'html'; + + // We'll be catching all pasted content in one line, regardless of whether the + // it's introduced by a document command execution (e.g. toolbar buttons) or + // user paste behaviors. (e.g. Ctrl-V) editor.on( 'contentDom', function() { Index: /CKEditor/branches/features/paste/_source/plugins/enterkey/plugin.js =================================================================== --- /CKEditor/branches/features/paste/_source/plugins/enterkey/plugin.js (revision 4701) +++ /CKEditor/branches/features/paste/_source/plugins/enterkey/plugin.js (revision 4702) @@ -20,168 +20,170 @@ CKEDITOR.plugins.enterkey = { - enterBlock : function( editor, mode, range ) - { - // Get the range for the current selection. - range = range || getRange( editor ); - - var doc = range.document; - - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); - - // Split the range. - var splitInfo = range.splitBlock( blockTag ); - - if ( !splitInfo ) - return; - - // Get the current blocks. - var previousBlock = splitInfo.previousBlock, - nextBlock = splitInfo.nextBlock; - - var isStartOfBlock = splitInfo.wasStartOfBlock, - isEndOfBlock = splitInfo.wasEndOfBlock; - - var node; - - // If this is a block under a list item, split it as well. (#1647) - if ( nextBlock ) - { - node = nextBlock.getParent(); - if ( node.is( 'li' ) ) - { - nextBlock.breakParent( node ); - nextBlock.move( nextBlock.getNext(), true ); - } - } - else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) - { - previousBlock.breakParent( node ); - range.moveToElementEditStart( previousBlock.getNext() ); - previousBlock.move( previousBlock.getPrevious() ); - } - - // If we have both the previous and next blocks, it means that the - // boundaries were on separated blocks, or none of them where on the - // block limits (start/end). - if ( !isStartOfBlock && !isEndOfBlock ) - { - // If the next block is an
  • with another list tree as the first - // child, we'll need to append a filler (
    /NBSP) or the list item - // wouldn't be editable. (#1420) - if ( nextBlock.is( 'li' ) - && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) ) - && node.is && node.is( 'ul', 'ol' ) ) - ( CKEDITOR.env.ie ? doc.createText( '\xa0' ) : doc.createElement( 'br' ) ).insertBefore( node ); - - // Move the selection to the end block. - if ( nextBlock ) - range.moveToElementEditStart( nextBlock ); - } - else - { - - if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) - { - editor.execCommand( 'outdent' ); - return; - } - - var newBlock; - - if ( previousBlock ) - { - // Do not enter this block if it's a header tag, or we are in - // a Shift+Enter (#77). Create a new block element instead - // (later in the code). - if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) - { - // Otherwise, duplicate the previous block. - newBlock = previousBlock.clone(); - } - } - else if ( nextBlock ) - newBlock = nextBlock.clone(); - - if ( !newBlock ) - newBlock = doc.createElement( blockTag ); - - // Recreate the inline elements tree, which was available - // before hitting enter, so the same styles will be available in - // the new block. - var elementPath = splitInfo.elementPath; - if ( elementPath ) - { - for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) - { - var element = elementPath.elements[ i ]; - - if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) - break; - - if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) - { - element = element.clone(); - newBlock.moveChildren( element ); - newBlock.append( element ); - } - } - } - - if ( !CKEDITOR.env.ie ) - newBlock.appendBogus(); - - range.insertNode( newBlock ); - - // This is tricky, but to make the new block visible correctly - // we must select it. - // The previousBlock check has been included because it may be - // empty if we have fixed a block-less space (like ENTER into an - // empty table cell). - if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) - { - // Move the selection to the new block. - range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); - range.select(); - } - - // Move the selection to the new block. - range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); - } - - if ( !CKEDITOR.env.ie ) - { - if ( nextBlock ) - { - // If we have split the block, adds a temporary span at the - // range position and scroll relatively to it. - var tmpNode = doc.createElement( 'span' ); - - // We need some content for Safari. - tmpNode.setHtml( ' ' ); - - range.insertNode( tmpNode ); - tmpNode.scrollIntoView(); - range.deleteContents(); - } - else - { - // We may use the above scroll logic for the new block case - // too, but it gives some weird result with Opera. - newBlock.scrollIntoView(); - } - } - - range.select(); - }, - enterBr : function( editor, mode ) + enterBlock : function( editor, mode, range, forceMode ) { // Get the range for the current selection. - var range = getRange( editor ), - doc = range.document; + range = range || getRange( editor ); + + var doc = range.document; // Determine the block element to be used. var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + // Split the range. + var splitInfo = range.splitBlock( blockTag ); + + if ( !splitInfo ) + return; + + // Get the current blocks. + var previousBlock = splitInfo.previousBlock, + nextBlock = splitInfo.nextBlock; + + var isStartOfBlock = splitInfo.wasStartOfBlock, + isEndOfBlock = splitInfo.wasEndOfBlock; + + var node; + + // If this is a block under a list item, split it as well. (#1647) + if ( nextBlock ) + { + node = nextBlock.getParent(); + if ( node.is( 'li' ) ) + { + nextBlock.breakParent( node ); + nextBlock.move( nextBlock.getNext(), true ); + } + } + else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) + { + previousBlock.breakParent( node ); + range.moveToElementEditStart( previousBlock.getNext() ); + previousBlock.move( previousBlock.getPrevious() ); + } + + // If we have both the previous and next blocks, it means that the + // boundaries were on separated blocks, or none of them where on the + // block limits (start/end). + if ( !isStartOfBlock && !isEndOfBlock ) + { + // If the next block is an
  • with another list tree as the first + // child, we'll need to append a filler (
    /NBSP) or the list item + // wouldn't be editable. (#1420) + if ( nextBlock.is( 'li' ) + && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) ) + && node.is && node.is( 'ul', 'ol' ) ) + ( CKEDITOR.env.ie ? doc.createText( '\xa0' ) : doc.createElement( 'br' ) ).insertBefore( node ); + + // Move the selection to the end block. + if ( nextBlock ) + range.moveToElementEditStart( nextBlock ); + } + else + { + + if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) + { + editor.execCommand( 'outdent' ); + return; + } + + var newBlock; + + if ( previousBlock ) + { + // Do not enter this block if it's a header tag, or we are in + // a Shift+Enter (#77). Create a new block element instead + // (later in the code). + if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) + { + // Otherwise, duplicate the previous block. + newBlock = previousBlock.clone(); + } + } + else if ( nextBlock ) + newBlock = nextBlock.clone(); + + if ( !newBlock ) + newBlock = doc.createElement( blockTag ); + + // Recreate the inline elements tree, which was available + // before hitting enter, so the same styles will be available in + // the new block. + var elementPath = splitInfo.elementPath; + if ( elementPath ) + { + for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) + { + var element = elementPath.elements[ i ]; + + if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) + break; + + if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) + { + element = element.clone(); + newBlock.moveChildren( element ); + newBlock.append( element ); + } + } + } + + if ( !CKEDITOR.env.ie ) + newBlock.appendBogus(); + + range.insertNode( newBlock ); + + // This is tricky, but to make the new block visible correctly + // we must select it. + // The previousBlock check has been included because it may be + // empty if we have fixed a block-less space (like ENTER into an + // empty table cell). + if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) + { + // Move the selection to the new block. + range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); + range.select(); + } + + // Move the selection to the new block. + range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); + } + + if ( !CKEDITOR.env.ie ) + { + if ( nextBlock ) + { + // If we have split the block, adds a temporary span at the + // range position and scroll relatively to it. + var tmpNode = doc.createElement( 'span' ); + + // We need some content for Safari. + tmpNode.setHtml( ' ' ); + + range.insertNode( tmpNode ); + tmpNode.scrollIntoView(); + range.deleteContents(); + } + else + { + // We may use the above scroll logic for the new block case + // too, but it gives some weird result with Opera. + newBlock.scrollIntoView(); + } + } + + range.select(); + }, + + enterBr : function( editor, mode, range, forceMode ) + { + // Get the range for the current selection. + range = range || getRange( editor ); + + var doc = range.document; + + // Determine the block element to be used. + var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + var isEndOfBlock = range.checkEndOfBlock(); @@ -195,5 +197,5 @@ if ( !forceMode && startBlockTag == 'li' ) { - enterBlock( editor, mode, range ); + enterBlock( editor, mode, range, forceMode ); return; } @@ -278,5 +280,4 @@ enterBr = plugin.enterBr, enterBlock = plugin.enterBlock, - forceMode, headerTagRegex = /^h[1-6]$/; @@ -285,10 +286,8 @@ // On SHIFT+ENTER we want to enforce the mode to be respected, instead // of cloning the current block. (#77) - forceMode = 1; - - return enter( editor, editor.config.shiftEnterMode ); + return enter( editor, editor.config.shiftEnterMode, true ); } - function enter( editor, mode ) + function enter( editor, mode, forceMode ) { // Only effective within document. @@ -304,9 +303,8 @@ editor.fire( 'saveSnapshot' ); // Save undo step. if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) - enterBr( editor, mode ); + enterBr( editor, mode, null, forceMode ); else - enterBlock( editor, mode ); - - forceMode = 0; + enterBlock( editor, mode, null, forceMode ); + }, 0 ); Index: /CKEditor/branches/features/paste/_source/plugins/pastefromword/filter/default.js =================================================================== --- /CKEditor/branches/features/paste/_source/plugins/pastefromword/filter/default.js (revision 4702) +++ /CKEditor/branches/features/paste/_source/plugins/pastefromword/filter/default.js (revision 4702) @@ -0,0 +1,965 @@ + +( 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
      1. level2
      • => + // level1 + // level2 + flattenList : function( element ) + { + var attrs = element.attributes, + parent = element.parent; + + var listStyleType, + indentLevel = 1; + + // Resolve how many level nested. + while( parent ) + { + parent.attributes && parent.attributes[ 'cke:list'] && indentLevel++; + parent = parent.parent; + } + + // All list items are of the same type. + switch( attrs.type ) + { + case 'a' : + listStyleType = 'lower-alpha'; + break; + // TODO: Support more list style type from MS-Word. + } + + var children = element.children, + child; + + for ( var i = 0; i < children.length; i++ ) + { + child = children[ i ]; + var attributes = child.attributes; + + if( child.name in CKEDITOR.dtd.$listItem ) + { + var listItemChildren = child.children, + count = listItemChildren.length, + last = listItemChildren[ count - 1 ]; + + // Move out nested list. + if( last.name in CKEDITOR.dtd.$list ) + { + listItemChildren.length--; + children.splice( i + 1, 0, last ); + last.parent = element; + } + + child.name = 'cke:li'; + attributes[ 'cke:indent' ] = indentLevel; + attributes[ 'cke:listtype' ] = element.name; + listStyleType && child.addStyle( 'list-style-type', listStyleType, true ); + } + } + + + delete element.name; + // We're loosing tag name here, signalize this element as a list. + attrs[ 'cke:list' ] = 1; + }, + + /** + * A simple filter which always rejecting. + */ + falsyFilter : function( value ) + { + return false; + }, + + /** + * A filter dedicated on the 'style' attribute filtering, e.g. dropping/replacing style properties. + * @param styles {Array} in form of [ styleNameRegexp, styleValueRegexp, + * newStyleValue/newStyleGenerator, newStyleName ] where only the first + * parameter is mandatory. + */ + stylesFilter : function( styles ) + { + return function( styleText, element ) + { + var rules = []; + // html-encoded quote might be introduced by 'font-family' + // from MS-Word which confused the following regexp. e.g. + //'font-family: "Lucida, Console"' + styleText.replace( /"/g, '"' ) + .replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, + function( match, name, value ) + { + name = name.toLowerCase(); + name == 'font-family' && ( value = value.replace( /["']/g, '' ) ); + + var namePattern, + valuePattern, + newValue, + newName; + for( var i = 0 ; i < styles.length; i++ ) + { + if( styles[ i ] ) + { + namePattern = styles[ i ][ 0 ]; + valuePattern = styles[ i ][ 1 ]; + newValue = styles[ i ][ 2 ]; + newName = styles[ i ][ 3 ]; + + if ( name.match( namePattern ) + && ( !valuePattern || value.match( valuePattern ) ) ) + { + name = newName || name; + if( typeof newValue == 'function' ) + newValue = newValue( value, element ); + if( typeof newValue == 'string' ) + rules.push( [ name, newValue ] ); + return; + } + } + } + rules.push( [ name, value ] ); + + } ); + + for ( var i = 0 ; i < rules.length ; i++ ) + rules[ i ] = rules[ i ].join( ':' ); + return rules.length ? + ( rules.join( ';' ) + ';' ) : false; + }; + }, + + /** + * Migrate the element by decorate styles on it. + * @param styleDefiniton + * @param variables + */ + elementMigrateFilter : function ( styleDefiniton, variables ) + { + return function( element ) + { + var styleDef = + variables ? + new CKEDITOR.style( styleDefiniton, variables )._.definition + : styleDefiniton; + element.name = styleDef.element; + CKEDITOR.tools.extend( element.attributes, CKEDITOR.tools.clone( styleDef.attributes ) ); + element.addStyle( CKEDITOR.style.getStyleText( styleDef ) ); + } + }, + + /** + * Migrate styles by creating a new nested stylish element. + * @param styleDefinition + */ + styleMigrateFilter : function( styleDefinition, variableName ) + { + + var elementMigrateFilter = this.elementMigrateFilter; + return function( value, element ) + { + // Build an stylish element first. + var styleElement = new CKEDITOR.htmlParser.element( null ), + variables = {}; + + variables[ variableName ] = value; + elementMigrateFilter( styleDefinition, variables )( styleElement ); + // Place the new element inside the existing span. + styleElement.children = element.children; + element.children = [ styleElement ]; + }; + }, + + /** + * A filter which remove cke-namespaced-attribute on + * all none-cke-namespaced elements. + * @param value + * @param element + */ + bogusAttrFilter : function( value, element ) + { + if( element.name.indexOf( 'cke:' ) == -1 ) + return false; + }, + + /** + * A filter which will be used to apply inline css style according the stylesheet + * definition rules, is generated lazily when filtering. + */ + applyStyleFilter : null + + }, + + getRules : function( editor ) + { + var dtd = CKEDITOR.dtd, + blockLike = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent ), + config = editor.config, + filters = this.filters, + falsyFilter = filters.falsyFilter, + stylesFilter = filters.stylesFilter, + elementMigrateFilter = filters.elementMigrateFilter, + styleMigrateFilter = CKEDITOR.tools.bind( this.filters.styleMigrateFilter, this.filters ), + bogusAttrFilter = filters.bogusAttrFilter, + createListBulletMarker = this.utils.createListBulletMarker, + flattenList = filters.flattenList, + isListBulletIndicator = this.utils.isListBulletIndicator, + containsNothingButSpaces = this.utils.isContainingOnlySpaces, + resolveListItem = this.utils.resolveList, + convertToPx = this.utils.convertToPx, + listDtdParents = this.utils.listDtdParents, + ignoreFontFace = config.pasteFromWordIgnoreFontFace; + + return { + + elementNames : + [ + // Remove script, meta and link elements. + [ /meta|link|script/, '' ] + ], + + elements : + { + '^' : function( element ) + { + // Transform CSS style declaration to inline style. + var applyStyleFilter; + if ( CKEDITOR.env.gecko && ( applyStyleFilter = filters.applyStyleFilter ) ) + applyStyleFilter( element ); + }, + + $ : function( element ) + { + var tagName = element.name || '', + attrs = element.attributes; + + // Convert length unit of width/height on blocks to + // a more editor-friendly way (px). + if( tagName in blockLike + && attrs.style ) + attrs.style = stylesFilter( + [ [ /^width|height$/, null, convertToPx ] ] )( attrs.style ) || ''; + + // Processing headings. + if ( tagName.match( /h\d/ ) ) + { + element.filterChildren(); + // Is the heading actually a list item? + if( resolveListItem( element ) ) + return; + + // Adapt heading styles to editor's convention. + elementMigrateFilter( config[ 'format_' + tagName ] )( element ); + } + // Remove inline elements which contain only empty spaces. + else if( tagName in dtd.$nonEmptyInline ) + { + element.filterChildren(); + if ( containsNothingButSpaces(element) ) + delete element.name; + } + // Remove ms-office namespaced element, with it's content preserved. + else if( tagName.indexOf( ':' ) != -1 + && tagName.indexOf( 'cke' ) == -1 ) + { + element.filterChildren(); + + // Restore image real link from vml. + if( tagName == 'v:imagedata' ) + { + var href = element.attributes[ 'o:href' ]; + if ( href ) + element.attributes.src = href; + element.name = 'img'; + return; + } + delete element.name; + } + + // Assembling list items into a whole list. + if( !tagName || tagName in listDtdParents ) + { + element.filterChildren(); + + var children = element.children, child, + listItem, // The current processing cke:li element. + listItemAttrs, + listType, // Determine the root type of the list. + listItemIndent, // Indent level of current list item. + lastListItem, // The previous one just been added to the list. + list, parentList, // Current staging list and it's parent list if any. + indent; + + for( var i = 0 ; i < children.length; i++ ) + { + child = children[ i ]; + + if ( 'cke:li' == child.name ) + { + child.name = 'li'; + listItem = child; + listItemAttrs = listItem.attributes; + listType = listItem.attributes[ 'cke:listtype' ]; + // The indent attribute might not present. + listItemIndent = parseInt( listItemAttrs[ 'cke:indent' ] ) || 0; + + // Ignore the 'list-style-type' attribute if it's matched with + // the list root element's default style type. + listItemAttrs.style = stylesFilter( + [ [ 'list-style-type', listType == 'ol'? 'decimal' : 'disc' ] ] )( listItemAttrs.style ) || '' ; + + if ( !list ) + { + parentList = list = new CKEDITOR.htmlParser.element( listType ); + list.add( listItem ); + children[ i ] = list; + } + else + { + if( listItemIndent > indent ) + { + parentList = list; + list = new CKEDITOR.htmlParser.element( listType ); + list.add( listItem ); + lastListItem.add( list ); + } + else if( listItemIndent < indent ) + { + list = parentList; + parentList = list.parent ? list.parent.parent : list; + list.add( listItem ); + } + else + list.add( listItem ); + + children.splice( i-- , 1 ); + } + + lastListItem = listItem; + indent = listItemIndent; + } + else + list = null; + } + } + }, + // We'll drop any style sheet, but Firefox conclude + // certain styles in a single style element, which are + // required to be changed into inline ones. + 'style' : function( element ) + { + if( CKEDITOR.env.gecko ) + { + // Grab only the style definition section. + var styleDefSection = element.onlyChild().value.match( /\/\* Style Definitions \*\/([\s\S]*?)\/\*/ ), + styleDefText = styleDefSection && styleDefSection[ 1 ], + rules = {}; // Storing the parsed result. + + if( styleDefText ) + { + styleDefText.replace(/[\n\r]/g,'') // remove line-breaks. + // Extract selectors and style properties. + .replace( /(.+?)\{(.+?)\}/g, + function( rule, selectors, styleBlock ) + { + selectors = selectors.split( ',' ); + var length = selectors.length, selector; + for ( var i = 0; i < length; i++ ) + { + // Assume MS-Word mostly generate only simple + // selector( [Type selector][Class selector]). + CKEDITOR.tools.trim( selectors[ i ] ) + .replace( /^(\w+)(\.[\w-]+)?$/g, + function( match, tagName, className ) + { + tagName = tagName || '*'; + className = className.substring( 1, className.length ); + + // Reject MS-Word Normal styles. + if( className.match( /MsoNormal/ ) ) + return; + + if( !rules[ tagName ] ) + rules[ tagName ] = {}; + if( className ) + rules[ tagName ][ className ] = styleBlock; + else + rules[ tagName ] = styleBlock; + } ); + } + } ); + + filters.applyStyleFilter = function( element ) + { + var name = rules[ '*' ] ? '*' : element.name, + className = element.attributes && element.attributes[ 'class' ], + style; + if( name in rules ) + { + style = rules[ name ]; + if( typeof style == 'object' ) + style = style[ className ]; + // Maintain style rules priorities. + style && element.addStyle( style, true ); + } + }; + } + } + return false; + }, + 'p' : function( element ) + { + element.filterChildren(); + + var attrs = element.attributes, + parent = element.parent, + children = element.children; + + // Is the paragraph actually a list item? + if( resolveListItem( element ) ) + return; + + // Adapt paragraph formatting to editor's convention + // according to enter-mode. + if( config.enterMode == CKEDITOR.ENTER_BR ) + { + // We suffer from attribute/style lost in this situation. + delete element.name; + element.add( new CKEDITOR.htmlParser.element( 'br' ) ); + } + else + elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element ); + }, + + 'td' : function ( element ) + { + // 'td' in 'thead' is actually . + if ( element.getAncestor( 'thead') ) + element.name = 'th'; + }, + + // MS-Word sometimes present list as a mixing of normal list + // and pseudo-list, normalize the previous ones into pseudo form. + 'ol' : flattenList, + 'ul' : flattenList, + 'dl' : flattenList, + + 'font' : function( element ) + { + // IE/Safari: drop the font tag if it comes from list bullet text. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) + { + delete element.name; + return; + } + + element.filterChildren(); + + var attrs = element.attributes, + styleText = attrs.style, + parent = element.parent; + + if( 'font' == parent.name ) // Merge nested tags. + { + CKEDITOR.tools.extend( parent.attributes, + element.attributes ); + styleText && parent.addStyle( styleText ); + delete element.name; + return; + } + // Convert the merged into a span with all attributes preserved. + else + { + styleText = styleText || ''; + // IE's having those deprecated attributes, normalize them. + if ( attrs.color ) + { + attrs.color != '#000000' && ( styleText += 'color:' + attrs.color + ';' ); + delete attrs.color; + } + if ( attrs.face ) + { + styleText += 'font-family:' + attrs.face + ';'; + delete attrs.face; + } + // TODO: Mapping size in ranges of xx-small, + // x-small, small, medium, large, x-large, xx-large. + if ( attrs.size ) + { + styleText += 'font-size:' + + ( attrs.size > 3 ? 'large' + : ( attrs.size < 3 ? 'small' : 'medium' ) ) + ';'; + delete attrs.size; + } + element.name = 'span'; + element.addStyle( styleText ); + } + }, + + 'span' : function( element ) + { + // IE/Safari: remove the span if it comes from list bullet text. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) + return false; + + element.filterChildren(); + if( containsNothingButSpaces( element ) ) + { + delete element.name; + return; + } + + // For IE/Safari: List item bullet type is supposed to be indicated by + // the text of a span with style 'mso-list : Ignore'. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element ) ) + { + var listSymbol = element.firstTextChild().value, + listType = listSymbol.match( /^([^\s]+?)([.)]?)$/ ); + return createListBulletMarker( listType, listSymbol ); + } + + // Update the src attribute of image element with href. + var children = element.children, + attrs = element.attributes, + styleText = attrs && attrs.style, + firstChild = children && children[ 0 ]; + + if( firstChild && firstChild.name == 'cke:imagesource' ) + { + var secondChild = children[ 1 ]; + if ( 'img' == secondChild.name ) + secondChild.attributes.src = firstChild.attributes.src; + children.splice( 0, 1 ); + delete element.name; + } + + // Assume MS-Word mostly carry font related styles on , + // adapting them to editor's convention. + if( styleText ) + attrs.style = stylesFilter( + [ + // Drop 'inline-height' style which make lines overlapping. + [ 'line-height' ], + !ignoreFontFace ? [ /^font-family$/, null, styleMigrateFilter( config[ 'font_style' ], 'family' ) ] : null, + !ignoreFontFace ? [ /^font-size$/, null, styleMigrateFilter( config[ 'fontSize_style' ], 'size' ) ] : null, + [ /^color$/, null, styleMigrateFilter( config[ 'colorButton_foreStyle' ], 'color' ) ], + [ /^background-color$/, null, styleMigrateFilter( config[ 'colorButton_backStyle' ], 'color' ) ] + ] )( styleText, element ) || ''; + }, + + // Migrate basic style formats to editor configured ones. + 'b' : elementMigrateFilter( config[ 'coreStyles_bold' ] ), + 'i' : elementMigrateFilter( config[ 'coreStyles_italic' ] ), + 'u' : elementMigrateFilter( config[ 'coreStyles_underline' ] ), + 's' : elementMigrateFilter( config[ 'coreStyles_strike' ] ), + 'sup' : elementMigrateFilter( config[ 'coreStyles_superscript' ] ), + 'sub' : elementMigrateFilter( config[ 'coreStyles_subscript' ] ), + // Editor doesn't support anchor with content currently (#3582), + // drop such anchors with content preserved. + 'a' : function( element ) + { + var attrs = element.attributes; + if( attrs && !attrs.href && attrs.name ) + delete element.name; + }, + 'cke:listbullet' : function( element ) + { + if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList ) + delete element.name; + } + }, + + attributeNames : + [ + // Remove onmouseover and onmouseout events (from MS Word comments effect) + [ /^onmouse(:?out|over)/, '' ], + // Remove office and vml attribute from elements. + [ /(?:v|o):\w+/, '' ], + // Remove lang/language attributes. + [ /^lang/, '' ] + ], + + attributes : + { + 'style' : stylesFilter( + [ + [ /^mso-/ ], + // Fixing color values. + [ /-color$/, null, function( value ) + { + if( value == 'transparent' ) + return false; + if( CKEDITOR.env.gecko ) + return value.replace( /-moz-use-text-color/g, 'transparent' ); + } ], + // Remove empty margin values, e.g. 0.00001pt 0em 0pt + [ /^margin$/, /^(?:\b0[^\s]*\s*){1,4}$/ ], + [ 'text-indent', '0cm' ], + [ 'page-break-before' ], + [ 'tab-stops' ], + [ 'display', 'none' ], + ignoreFontFace ? [ /font-?/ ] : null, + ] ), + // Prefer width styles over 'width' attributes. + 'width' : function( value, element ) + { + if( element.name in dtd.$tableContent ) + return false; + }, + // Prefer border styles over table 'border' attributes. + 'border' : function( value, element ) + { + if( element.name in dtd.$tableContent ) + return false; + }, + + // Only Firefox carry style sheet from MS-Word, which + // will be applied by us manually. For other browsers + // the css className is useless. + 'class' : falsyFilter, + + // MS-Word always generate both 'text-align' along with + // 'align' attribute( 'background-color' along with 'bgcolor'), + // simply drop the deprecated attributes. + 'align' : falsyFilter, + 'bgcolor' : falsyFilter, + + // Deprecate 'valign' attribute in favor of 'vertical-align'. + 'valign' : function( value, element ) + { + element.addStyle( 'vertical-align', value ); + return false; + } + }, + + // Fore none-IE, some useful data might be buried under these IE-conditional + // comments where RegExp were the right approach to dig them out where usual approach + // is transform it into a fake element node which hold the desired data. + comment : !CKEDITOR.env.ie ? function( value, node ) + { + var imageInfo = value.match( // ), + imageSource = value.match( /]*o:href=['"](.*?)['"]/ ), + listInfo = value.match( /^\[if !supportLists\]([\s\S]*?)\[endif\]$/ ); + + // Reveal the element in conditional comments for Firefox. + if( CKEDITOR.env.gecko && imageInfo ) + return CKEDITOR.htmlParser.fragment.fromHtml( imageInfo[ 0 ] ).children[ 0 ]; + // Try to dig the real image link from vml markup. + if( imageSource ) + return new CKEDITOR.htmlParser.element( 'cke:imagesource', { src : imageSource[ 1 ] } ); + // Seek for list bullet style indicator. + if ( listInfo ) + { + var listSymbol = listInfo[ 1 ], + listType = listSymbol.match( />([^\s]+?)([.)]?)... + if( CKEDITOR.env.gecko ) + data = data.replace( /(([\S\s]*?))/gi, '$1$2$3' ); + + var pasteProcessor = new CKEDITOR.pasteProcessor(), + dataFilter = pasteProcessor.dataFilter; + // These rules will have higher priorities than default ones. + dataFilter.addRules( CKEDITOR.plugins.pastefromword.getRules( this ) ); + editor.fire( 'beforeCleanWord', { filter : dataFilter } ); + return pasteProcessor.toHtml( data, false ); + }; + +} )( ); + +/** + * Whether the ignore all font-related format from MS-Word. + * @name CKEDITOR.config.pasteFromWordIgnoreFontFace + * @type Boolean + * @default true + * @example + * config.pasteFromWordIgnoreFontFace = false; + */ + +/** + * Whether transform MS-Word Outline Numbered Heading into html list. + * @name CKEDITOR.config.pasteFromWordNumberedHeadingToList + * @type Boolean + * @default false + * @example + * config.pasteFromWordNumberedHeadingToList = true; + */ Index: /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js =================================================================== --- /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js (revision 4701) +++ /CKEditor/branches/features/paste/_source/plugins/pastefromword/plugin.js (revision 4702) @@ -27,4 +27,5 @@ editor.addCommand( 'pastefromword', { + canUndo : false, exec : function () { @@ -51,6 +52,6 @@ { var data = evt.data, - isLazyLoad, mswordHtml; + // MS-WORD format sniffing. if ( ( mswordHtml = data[ 'html' ] ) @@ -59,30 +60,16 @@ || ( forceFromWord || confirm( editor.lang.pastefromword.confirmCleanup ) ) ) ) { - if( isLazyLoad = this.loadFilterRules( function() + var isLazyLoad = this.loadFilterRules( function() { - // Re-continue the event with the original data. - if( isLazyLoad ) + // Event continuation 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' ); - } + data[ 'html' ] = CKEDITOR.cleanWord( mswordHtml, editor ); + } ); - 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(); - } + // The cleanup rules are to be loaded, we should just cancel + // this event. + isLazyLoad && evt.cancel(); } }, this ); @@ -91,11 +78,14 @@ loadFilterRules : function( callback ) { - var isLoaded = typeof CKEDITOR.plugins.pastefromword != 'undefined'; + var isLoaded = CKEDITOR.cleanWord, + filterFilePath = CKEDITOR.getUrl( this.path + + 'filter/' + + ( CKEDITOR.config.pasteFromWordCleanUpFile || 'default' ) + + '.js' ); isLoaded ? callback() : // Load with busy indicator. - CKEDITOR.scriptLoader.load( this.path + 'rules.js', - callback, null, false, true ); + CKEDITOR.scriptLoader.load( filterFilePath, callback, null, false, true ); return !isLoaded; @@ -112,2 +102,13 @@ * config.pasteFromWordPromptCleanup = true; */ + +/** + * The file that provides the MS-Word Filtering rules. + * Note: It's a global configuration which are shared by all editor instances. + * @name CKEDITOR.config.pasteFromWordCleanUpFile + * @type String + * @default 'default' + * @example + * // Load from 'pastefromword' plugin 'filter' sub folder (custom.js file). + * CKEDITOR.config.pasteFromWordCleanUpFile = 'custom'; + */ Index: Editor/branches/features/paste/_source/plugins/pastefromword/rules.js =================================================================== --- /CKEditor/branches/features/paste/_source/plugins/pastefromword/rules.js (revision 4701) +++ (revision ) @@ -1,931 +1,0 @@ -( 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
        1. level2
        • => - // level1 - // level2 - flattenList : function( element ) - { - var attrs = element.attributes, - parent = element.parent; - - var listStyleType, - indentLevel = 1; - - // Resolve how many level nested. - while( parent ) - { - parent.attributes && parent.attributes[ 'cke:list'] && indentLevel++; - parent = parent.parent; - } - - // All list items are of the same type. - switch( attrs.type ) - { - case 'a' : - listStyleType = 'lower-alpha'; - break; - // TODO: Support more list style type from MS-Word. - } - - var children = element.children, - child; - - for ( var i = 0; i < children.length; i++ ) - { - child = children[ i ]; - var attributes = child.attributes; - - if( child.name in CKEDITOR.dtd.$listItem ) - { - var listItemChildren = child.children, - count = listItemChildren.length, - last = listItemChildren[ count - 1 ]; - - // Move out nested list. - if( last.name in CKEDITOR.dtd.$list ) - { - listItemChildren.length--; - children.splice( i + 1, 0, last ); - last.parent = element; - } - - child.name = 'cke:li'; - attributes[ 'cke:indent' ] = indentLevel; - attributes[ 'cke:listtype' ] = element.name; - listStyleType && child.addStyle( 'list-style-type', listStyleType, true ); - } - } - - - delete element.name; - // We're loosing tag name here, signalize this element as a list. - attrs[ 'cke:list' ] = 1; - }, - - /** - * A simple filter which always rejecting. - */ - falsyFilter : function( value ) - { - return false; - }, - - /** - * A filter dedicated on the 'style' attribute filtering, e.g. dropping/replacing style properties. - * @param styles {Array} in form of [ styleNameRegexp, styleValueRegexp, - * newStyleValue/newStyleGenerator, newStyleName ] where only the first - * parameter is mandatory. - */ - stylesFilter : function( styles ) - { - return function( styleText, element ) - { - var rules = []; - // html-encoded quote might be introduced by 'font-family' - // from MS-Word which confused the following regexp. e.g. - //'font-family: "Lucida, Console"' - styleText.replace( /"/g, '"' ) - .replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, - function( match, name, value ) - { - name = name.toLowerCase(); - name == 'font-family' && ( value = value.replace( /["']/g, '' ) ); - - var namePattern, - valuePattern, - newValue, - newName; - for( var i = 0 ; i < styles.length; i++ ) - { - if( styles[ i ] ) - { - namePattern = styles[ i ][ 0 ]; - valuePattern = styles[ i ][ 1 ]; - newValue = styles[ i ][ 2 ]; - newName = styles[ i ][ 3 ]; - - if ( name.match( namePattern ) - && ( !valuePattern || value.match( valuePattern ) ) ) - { - name = newName || name; - if( typeof newValue == 'function' ) - newValue = newValue( value, element ); - if( typeof newValue == 'string' ) - rules.push( [ name, newValue ] ); - return; - } - } - } - rules.push( [ name, value ] ); - - } ); - - for ( var i = 0 ; i < rules.length ; i++ ) - rules[ i ] = rules[ i ].join( ':' ); - return rules.length ? - ( rules.join( ';' ) + ';' ) : false; - }; - }, - - /** - * Migrate the element by decorate styles on it. - * @param styleDefiniton - * @param variables - */ - elementMigrateFilter : function ( styleDefiniton, variables ) - { - return function( element ) - { - var styleDef = - variables ? - new CKEDITOR.style( styleDefiniton, variables )._.definition - : styleDefiniton; - element.name = styleDef.element; - CKEDITOR.tools.extend( element.attributes, CKEDITOR.tools.clone( styleDef.attributes ) ); - element.addStyle( CKEDITOR.style.getStyleText( styleDef ) ); - } - }, - - /** - * Migrate styles by creating a new nested stylish element. - * @param styleDefinition - */ - styleMigrateFilter : function( styleDefinition, variableName ) - { - - var elementMigrateFilter = this.elementMigrateFilter; - return function( value, element ) - { - // Build an stylish element first. - var styleElement = new CKEDITOR.htmlParser.element( null ), - variables = {}; - - variables[ variableName ] = value; - elementMigrateFilter( styleDefinition, variables )( styleElement ); - // Place the new element inside the existing span. - styleElement.children = element.children; - element.children = [ styleElement ]; - }; - }, - - /** - * A filter which remove cke-namespaced-attribute on - * all none-cke-namespaced elements. - * @param value - * @param element - */ - bogusAttrFilter : function( value, element ) - { - if( element.name.indexOf( 'cke:' ) == -1 ) - return false; - }, - - /** - * A filter which will be used to apply inline css style according the stylesheet - * definition rules, is generated lazily when filtering. - */ - applyStyleFilter : null - - }, - - getRules : function( editor ) - { - var dtd = CKEDITOR.dtd, - blockLike = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent ), - config = editor.config, - filters = this.filters, - falsyFilter = filters.falsyFilter, - stylesFilter = filters.stylesFilter, - elementMigrateFilter = filters.elementMigrateFilter, - styleMigrateFilter = CKEDITOR.tools.bind( this.filters.styleMigrateFilter, this.filters ), - bogusAttrFilter = filters.bogusAttrFilter, - createListBulletMarker = this.utils.createListBulletMarker, - flattenList = filters.flattenList, - isListBulletIndicator = this.utils.isListBulletIndicator, - containsNothingButSpaces = this.utils.isContainingOnlySpaces, - resolveListItem = this.utils.resolveList, - convertToPx = this.utils.convertToPx, - listDtdParents = this.utils.listDtdParents, - ignoreFontFace = config.pasteFromWordIgnoreFontFace; - - return { - - elementNames : - [ - // Remove script, meta and link elements. - [ /meta|link|script/, '' ] - ], - - elements : - { - '^' : function( element ) - { - // Transform CSS style declaration to inline style. - var applyStyleFilter; - if ( CKEDITOR.env.gecko && ( applyStyleFilter = filters.applyStyleFilter ) ) - applyStyleFilter( element ); - }, - - $ : function( element ) - { - var tagName = element.name || '', - attrs = element.attributes; - - // Convert length unit of width/height on blocks to - // a more editor-friendly way (px). - if( tagName in blockLike - && attrs.style ) - attrs.style = stylesFilter( - [ [ /^width|height$/, null, convertToPx ] ] )( attrs.style ) || ''; - - // Processing headings. - if ( tagName.match( /h\d/ ) ) - { - element.filterChildren(); - // Is the heading actually a list item? - if( resolveListItem( element ) ) - return; - - // Adapt heading styles to editor's convention. - elementMigrateFilter( config[ 'format_' + tagName ] )( element ); - } - // Remove inline elements which contain only empty spaces. - else if( tagName in dtd.$nonEmptyInline ) - { - element.filterChildren(); - if ( containsNothingButSpaces(element) ) - delete element.name; - } - // Remove ms-office namespaced element, with it's content preserved. - else if( tagName.indexOf( ':' ) != -1 - && tagName.indexOf( 'cke' ) == -1 ) - { - element.filterChildren(); - - // Restore image real link from vml. - if( tagName == 'v:imagedata' ) - { - var href = element.attributes[ 'o:href' ]; - if ( href ) - element.attributes.src = href; - element.name = 'img'; - return; - } - delete element.name; - } - - // Assembling list items into a whole list. - if( !tagName || tagName in listDtdParents ) - { - element.filterChildren(); - - var children = element.children, child, - listItem, // The current processing cke:li element. - listItemAttrs, - listType, // Determine the root type of the list. - listItemIndent, // Indent level of current list item. - lastListItem, // The previous one just been added to the list. - list, parentList, // Current staging list and it's parent list if any. - indent; - - for( var i = 0 ; i < children.length; i++ ) - { - child = children[ i ]; - - if ( 'cke:li' == child.name ) - { - child.name = 'li'; - listItem = child; - listItemAttrs = listItem.attributes; - listType = listItem.attributes[ 'cke:listtype' ]; - // The indent attribute might not present. - listItemIndent = parseInt( listItemAttrs[ 'cke:indent' ] ) || 0; - - // Ignore the 'list-style-type' attribute if it's matched with - // the list root element's default style type. - listItemAttrs.style = stylesFilter( - [ [ 'list-style-type', listType == 'ol'? 'decimal' : 'disc' ] ] )( listItemAttrs.style ) || '' ; - - if ( !list ) - { - parentList = list = new CKEDITOR.htmlParser.element( listType ); - list.add( listItem ); - children[ i ] = list; - } - else - { - if( listItemIndent > indent ) - { - parentList = list; - list = new CKEDITOR.htmlParser.element( listType ); - list.add( listItem ); - lastListItem.add( list ); - } - else if( listItemIndent < indent ) - { - list = parentList; - parentList = list.parent ? list.parent.parent : list; - list.add( listItem ); - } - else - list.add( listItem ); - - children.splice( i-- , 1 ); - } - - lastListItem = listItem; - indent = listItemIndent; - } - else - list = null; - } - } - }, - // We'll drop any style sheet, but Firefox conclude - // certain styles in a single style element, which are - // required to be changed into inline ones. - 'style' : function( element ) - { - if( CKEDITOR.env.gecko ) - { - // Grab only the style definition section. - var styleDefSection = element.onlyChild().value.match( /\/\* Style Definitions \*\/([\s\S]*?)\/\*/ ), - styleDefText = styleDefSection && styleDefSection[ 1 ], - rules = {}; // Storing the parsed result. - - if( styleDefText ) - { - styleDefText.replace(/[\n\r]/g,'') // remove line-breaks. - // Extract selectors and style properties. - .replace( /(.+?)\{(.+?)\}/g, - function( rule, selectors, styleBlock ) - { - selectors = selectors.split( ',' ); - var length = selectors.length, selector; - for ( var i = 0; i < length; i++ ) - { - // Assume MS-Word mostly generate only simple - // selector( [Type selector][Class selector]). - CKEDITOR.tools.trim( selectors[ i ] ) - .replace( /^(\w+)(\.[\w-]+)?$/g, - function( match, tagName, className ) - { - tagName = tagName || '*'; - className = className.substring( 1, className.length ); - - // Reject MS-Word Normal styles. - if( className.match( /MsoNormal/ ) ) - return; - - if( !rules[ tagName ] ) - rules[ tagName ] = {}; - if( className ) - rules[ tagName ][ className ] = styleBlock; - else - rules[ tagName ] = styleBlock; - } ); - } - } ); - - filters.applyStyleFilter = function( element ) - { - var name = rules[ '*' ] ? '*' : element.name, - className = element.attributes && element.attributes[ 'class' ], - style; - if( name in rules ) - { - style = rules[ name ]; - if( typeof style == 'object' ) - style = style[ className ]; - // Maintain style rules priorities. - style && element.addStyle( style, true ); - } - }; - } - } - return false; - }, - 'p' : function( element ) - { - element.filterChildren(); - - var attrs = element.attributes, - parent = element.parent, - children = element.children; - - // Is the paragraph actually a list item? - if( resolveListItem( element ) ) - return; - - // Adapt paragraph formatting to editor's convention - // according to enter-mode. - if( config.enterMode == CKEDITOR.ENTER_BR ) - { - // We suffer from attribute/style lost in this situation. - delete element.name; - element.add( new CKEDITOR.htmlParser.element( 'br' ) ); - } - else - elementMigrateFilter( config[ 'format_' + ( config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ] )( element ); - }, - - 'td' : function ( element ) - { - // 'td' in 'thead' is actually . - if ( element.getAncestor( 'thead') ) - element.name = 'th'; - }, - - // MS-Word sometimes present list as a mixing of normal list - // and pseudo-list, normalize the previous ones into pseudo form. - 'ol' : flattenList, - 'ul' : flattenList, - 'dl' : flattenList, - - 'font' : function( element ) - { - // IE/Safari: drop the font tag if it comes from list bullet text. - if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) - { - delete element.name; - return; - } - - element.filterChildren(); - - var attrs = element.attributes, - styleText = attrs.style, - parent = element.parent; - - if( 'font' == parent.name ) // Merge nested tags. - { - CKEDITOR.tools.extend( parent.attributes, - element.attributes ); - styleText && parent.addStyle( styleText ); - delete element.name; - return; - } - // Convert the merged into a span with all attributes preserved. - else - { - styleText = styleText || ''; - // IE's having those deprecated attributes, normalize them. - if ( attrs.color ) - { - attrs.color != '#000000' && ( styleText += 'color:' + attrs.color + ';' ); - delete attrs.color; - } - if ( attrs.face ) - { - styleText += 'font-family:' + attrs.face + ';'; - delete attrs.face; - } - // TODO: Mapping size in ranges of xx-small, - // x-small, small, medium, large, x-large, xx-large. - if ( attrs.size ) - { - styleText += 'font-size:' + - ( attrs.size > 3 ? 'large' - : ( attrs.size < 3 ? 'small' : 'medium' ) ) + ';'; - delete attrs.size; - } - element.name = 'span'; - element.addStyle( styleText ); - } - }, - - 'span' : function( element ) - { - // IE/Safari: remove the span if it comes from list bullet text. - if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) - return false; - - element.filterChildren(); - if( containsNothingButSpaces( element ) ) - { - delete element.name; - return; - } - - // For IE/Safari: List item bullet type is supposed to be indicated by - // the text of a span with style 'mso-list : Ignore'. - if ( !CKEDITOR.env.gecko && isListBulletIndicator( element ) ) - { - var listSymbol = element.firstTextChild().value, - listType = listSymbol.match( /^([^\s]+?)([.)]?)$/ ); - return createListBulletMarker( listType, listSymbol ); - } - - // Update the src attribute of image element with href. - var children = element.children, - attrs = element.attributes, - styleText = attrs && attrs.style, - firstChild = children && children[ 0 ]; - - if( firstChild && firstChild.name == 'cke:imagesource' ) - { - var secondChild = children[ 1 ]; - if ( 'img' == secondChild.name ) - secondChild.attributes.src = firstChild.attributes.src; - children.splice( 0, 1 ); - delete element.name; - } - - // Assume MS-Word mostly carry font related styles on , - // adapting them to editor's convention. - if( styleText ) - attrs.style = stylesFilter( - [ - // Drop 'inline-height' style which make lines overlapping. - [ 'line-height' ], - !ignoreFontFace ? [ /^font-family$/, null, styleMigrateFilter( config[ 'font_style' ], 'family' ) ] : null, - !ignoreFontFace ? [ /^font-size$/, null, styleMigrateFilter( config[ 'fontSize_style' ], 'size' ) ] : null, - [ /^color$/, null, styleMigrateFilter( config[ 'colorButton_foreStyle' ], 'color' ) ], - [ /^background-color$/, null, styleMigrateFilter( config[ 'colorButton_backStyle' ], 'color' ) ] - ] )( styleText, element ) || ''; - }, - - // Migrate basic style formats to editor configured ones. - 'b' : elementMigrateFilter( config[ 'coreStyles_bold' ] ), - 'i' : elementMigrateFilter( config[ 'coreStyles_italic' ] ), - 'u' : elementMigrateFilter( config[ 'coreStyles_underline' ] ), - 's' : elementMigrateFilter( config[ 'coreStyles_strike' ] ), - 'sup' : elementMigrateFilter( config[ 'coreStyles_superscript' ] ), - 'sub' : elementMigrateFilter( config[ 'coreStyles_subscript' ] ), - // Editor doesn't support anchor with content currently (#3582), - // drop such anchors with content preserved. - 'a' : function( element ) - { - var attrs = element.attributes; - if( attrs && !attrs.href && attrs.name ) - delete element.name; - }, - 'cke:listbullet' : function( element ) - { - if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList ) - delete element.name; - } - }, - - attributeNames : - [ - // Remove onmouseover and onmouseout events (from MS Word comments effect) - [ /^onmouse(:?out|over)/, '' ], - // Remove office and vml attribute from elements. - [ /(?:v|o):\w+/, '' ], - // Remove lang/language attributes. - [ /^lang/, '' ] - ], - - attributes : - { - 'style' : stylesFilter( - [ - [ /^mso-/ ], - // Fixing color values. - [ /-color$/, null, function( value ) - { - if( value == 'transparent' ) - return false; - if( CKEDITOR.env.gecko ) - return value.replace( /-moz-use-text-color/g, 'transparent' ); - } ], - // Remove empty margin values, e.g. 0.00001pt 0em 0pt - [ /^margin$/, /^(?:\b0[^\s]*\s*){1,4}$/ ], - [ 'text-indent', '0cm' ], - [ 'page-break-before' ], - [ 'tab-stops' ], - [ 'display', 'none' ], - ignoreFontFace ? [ /font-?/ ] : null, - ] ), - // Prefer width styles over 'width' attributes. - 'width' : function( value, element ) - { - if( element.name in dtd.$tableContent ) - return false; - }, - // Prefer border styles over table 'border' attributes. - 'border' : function( value, element ) - { - if( element.name in dtd.$tableContent ) - return false; - }, - - // Only Firefox carry style sheet from MS-Word, which - // will be applied by us manually. For other browsers - // the css className is useless. - 'class' : falsyFilter, - - // MS-Word always generate both 'text-align' along with - // 'align' attribute( 'background-color' along with 'bgcolor'), - // simply drop the deprecated attributes. - 'align' : falsyFilter, - 'bgcolor' : falsyFilter, - - // Deprecate 'valign' attribute in favor of 'vertical-align'. - 'valign' : function( value, element ) - { - element.addStyle( 'vertical-align', value ); - return false; - } - }, - - // Fore none-IE, some useful data might be buried under these IE-conditional - // comments where RegExp were the right approach to dig them out where usual approach - // is transform it into a fake element node which hold the desired data. - comment : !CKEDITOR.env.ie ? function( value, node ) - { - var imageInfo = value.match( // ), - imageSource = value.match( /]*o:href=['"](.*?)['"]/ ), - listInfo = value.match( /^\[if !supportLists\]([\s\S]*?)\[endif\]$/ ); - - // Reveal the element in conditional comments for Firefox. - if( CKEDITOR.env.gecko && imageInfo ) - return CKEDITOR.htmlParser.fragment.fromHtml( imageInfo[ 0 ] ).children[ 0 ]; - // Try to dig the real image link from vml markup. - if( imageSource ) - return new CKEDITOR.htmlParser.element( 'cke:imagesource', { src : imageSource[ 1 ] } ); - // Seek for list bullet style indicator. - if ( listInfo ) - { - var listSymbol = listInfo[ 1 ], - listType = listSymbol.match( />([^\s]+?)([.)]?)