Skip to content
Permalink
Browse files

Merge branch 't/11504'

  • Loading branch information...
oleq committed Feb 14, 2014
2 parents 8a6472a + b0b9ce4 commit 9c7de1663d44799b015d8c357828817b4920bda4
Showing with 6 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +5 −3 core/htmlparser/element.js
@@ -19,6 +19,7 @@ Fixed Issues:
* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed [`selection.getRanges`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) does not override cached ranges when used with `onlyEditables` argument.
* [#11390](http://dev.ckeditor.com/ticket/11390): All [XML](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) plugin's methods work now on IE10+.
* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when right-to-left UI language is set.
* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When `config.fullPage` is set `true`, entities are not encoded in editor's output.

## CKEditor 4.3.2

@@ -492,10 +492,12 @@ CKEDITOR.htmlParser.cssStyle = function() {
if ( !ctx.off && this.attributes[ 'data-cke-processor' ] == 'off' )
changes.push( 'off', true );

if ( !ctx.nonEditable && this.attributes[ 'contenteditable' ] == 'false' )
if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' )
changes.push( 'nonEditable', true );
// A context to be given nestedEditable must be nonEditable first (by inheritance).
else if ( !ctx.nestedEditable && this.attributes[ 'contenteditable' ] == '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' )
changes.push( 'nestedEditable', true );

if ( changes.length ) {

0 comments on commit 9c7de16

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