Merge branch 't/11698'

ckeditor · May 6, 2014 · c523a9e · c523a9e
2 parents 535d87f + f77023f
commit c523a9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,8 +17,9 @@ Fixed Issues:
 * [#11839](http://dev.ckeditor.com/ticket/11839): Fixed: [IE9] Caret jumps out of editable when resizing editor in source mode.
 * [#11880](http://dev.ckeditor.com/ticket/11880): Fixed: [IE8-9] Linked image has a default thick border.
 * [#11822](http://dev.ckeditor.com/ticket/11822): Fixed: [Webkit] Anchors editing by double click broken in some cases.
-* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws error over scrollbar.
+* [#11823](http://dev.ckeditor.com/ticket/11823): Fixed: [IE8] [Table Resize](http://ckeditor.com/addon/tableresize) throws error over scrollbar.
 * [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change language back to undefined in [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog.
+* [#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`.
 
 Other changes:
 

diff --git a/core/htmlparser/element.js b/core/htmlparser/element.js
@@ -509,10 +509,10 @@ CKEDITOR.htmlParser.cssStyle = function() {
 
 			if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' )
 				changes.push( 'nonEditable', true );
-			// A context to be given nestedEditable must be nonEditable first (by inheritance) (#11372).
-			// Never set "nestedEditable" context for a body. If body is processed then it indicates
-			// a fullPage editor and there's no slightest change of nesting such editable (#11504).
-			else if ( this.name != 'body' && !ctx.nestedEditable && this.attributes.contenteditable == 'true' )
+			// A context to be given nestedEditable must be nonEditable first (by inheritance) (#11372, #11698).
+			// Special case: #11504 - filter starts on <body contenteditable=true>,
+			// so ctx.nonEditable has not been yet set to true.
+			else if ( ctx.nonEditable && !ctx.nestedEditable && this.attributes.contenteditable == 'true' )
 				changes.push( 'nestedEditable', true );
 
 			if ( changes.length ) {