Skip to content
Permalink
Browse files

Merge branch 't/9330'

  • Loading branch information...
Reinmar committed Aug 27, 2013
2 parents acaffaa + cbc0fa2 commit bde01c972003323201ed6972ade8d40131f4c3cc
Showing with 13 additions and 13 deletions.
  1. +1 −0 CHANGES.md
  2. +12 −13 plugins/pastefromword/filter/default.js
@@ -3,6 +3,7 @@ CKEditor 4 Changelog

## CKEditor 4.2.1

* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from Styles drop-down list not registered to the ACF in case when [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with IE10 Quirks mode.
@@ -952,21 +952,20 @@
},

// 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 ) {
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' ] ),

// Remove full paths from links to anchors.
a: function( element ) {
var attrs = element.attributes;
if ( attrs && !attrs.href && attrs.name )
delete element.name;
else if ( CKEDITOR.env.webkit && attrs.href && attrs.href.match( /file:\/\/\/[\S]+#/i ) )
attrs.href = attrs.href.replace( /file:\/\/\/[^#]+/i, '' );
if ( attrs.href && attrs.href.match( /^file:\/\/\/[\S]+#/i ) )
attrs.href = attrs.href.replace( /^file:\/\/\/[^#]+/i, '' );
},

'cke:listbullet': function( element ) {
if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList )
delete element.name;

0 comments on commit bde01c9

Please sign in to comment.
You can’t perform that action at this time.