Skip to content
Permalink
Browse files

Merge branch 't/10285'

  • Loading branch information
Reinmar committed Apr 17, 2013
2 parents 269eadd + c8e8ef2 commit 3e1df4d78fc931d19be5af6fafe0ed823d8309e2
Showing with 9 additions and 0 deletions.
  1. +1 −0 CHANGES.md
  2. +8 −0 plugins/pastefromword/filter/default.js
@@ -14,6 +14,7 @@ CKEditor 4 Changelog
* [#10315](http://dev.ckeditor.com/ticket/10315): [Webkit] Undo manager should not record snapshots after filling char has been added/removed.
* [#10291](http://dev.ckeditor.com/ticket/10291): [Webkit] Space after filling char should be secured.
* [#10330](http://dev.ckeditor.com/ticket/10330): [Webkit] Filling char is not removed on `keydown` in specific cases.
* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: styled text pasted from MS Word causes infinite loop.

## CKEditor 4.1

@@ -608,6 +608,14 @@
// Place the new element inside the existing span.
styleElement.children = element.children;
element.children = [ styleElement ];

// #10285 - later on styleElement will replace element if element won't have any attributes.
// However, in some cases styleElement is identical to element and therefore should not be filtered
// to avoid inf loop. Unfortunately calling element.filterChildren() does not prevent from that (#10327).
// However, we can assume that we don't need to filter styleElement at all, so it is safe to replace
// its filter method.
styleElement.filter = function() {};
styleElement.parent = element;
} : function(){};
},

0 comments on commit 3e1df4d

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