From 0e7f898feeb7485a6b8371f9f360ccc648797a58 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Thu, 13 Feb 2014 13:23:55 +0100 Subject: [PATCH 1/3] Fixed: If fullPage mode is on, body is being given a nestedEditable context while processed. --- core/htmlparser/element.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/htmlparser/element.js b/core/htmlparser/element.js index 3a92c02f4f2..dc1940ea2dd 100644 --- a/core/htmlparser/element.js +++ b/core/htmlparser/element.js @@ -494,8 +494,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). - 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 ) { From 5c03b3e7219fcfa17366c0533eba3ebed5f6e527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Fri, 14 Feb 2014 12:03:55 +0100 Subject: [PATCH 2/3] Micro enhancement. --- core/htmlparser/element.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/htmlparser/element.js b/core/htmlparser/element.js index dc1940ea2dd..2b8ce51dbc0 100644 --- a/core/htmlparser/element.js +++ b/core/htmlparser/element.js @@ -492,12 +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) (#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' ) + else if ( this.name != 'body' && !ctx.nestedEditable && this.attributes.contenteditable == 'true' ) changes.push( 'nestedEditable', true ); if ( changes.length ) { From b0b9ce41f116ebce8345c57f19b647e6e1f39c66 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Fri, 14 Feb 2014 14:31:12 +0100 Subject: [PATCH 3/3] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 2dbf03100a8..1b4d7922680 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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