Skip to content
Permalink
Browse files

Merge branch 't/11850'

  • Loading branch information...
Reinmar committed May 8, 2014
2 parents cce1107 + 741b7ef commit 0f68337d822ea01593ca288f755f58b8b5051ba3
Showing with 6 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +5 −2 plugins/fakeobjects/plugin.js
@@ -22,6 +22,7 @@ Fixed Issues:
* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with `contenteditable` attribute set to `true`.
* [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting non-editable element inside a table cell breaks the table badly.
* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop down is not "on" when clicking it while editor is blurred.
* [#11850](http://dev.ckeditor.com/ticket/11850): Fixed: Filter downcasting fake object to element it replaced is not applied if fake object element is non-editable.

Other changes:

@@ -64,8 +64,11 @@
var dataProcessor = editor.dataProcessor,
htmlFilter = dataProcessor && dataProcessor.htmlFilter;

if ( htmlFilter )
htmlFilter.addRules( htmlFilterRules );
if ( htmlFilter ) {
htmlFilter.addRules( htmlFilterRules, {
applyToAll: true
} );
}
}
} );

0 comments on commit 0f68337

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