From 24aa61850e08dba53caeccc997ad5dd4bafd7102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Tue, 7 Jan 2014 15:41:30 +0100 Subject: [PATCH 1/2] ContentDonUnload should be fired by all editables when they are detached. --- core/editable.js | 2 ++ plugins/wysiwygarea/plugin.js | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/editable.js b/core/editable.js index 76980d1b2eb..8cc964759be 100644 --- a/core/editable.js +++ b/core/editable.js @@ -774,6 +774,8 @@ doc.setCustomData( 'stylesheet_ref', refs ); } + this.editor.fire( 'contentDomUnload' ); + // Free up the editor reference. delete this.editor; } diff --git a/plugins/wysiwygarea/plugin.js b/plugins/wysiwygarea/plugin.js index 6b464e7b627..f1801251348 100644 --- a/plugins/wysiwygarea/plugin.js +++ b/plugins/wysiwygarea/plugin.js @@ -511,9 +511,6 @@ var onResize = iframe.removeCustomData( 'onResize' ); onResize && onResize.removeListener(); - - editor.fire( 'contentDomUnload' ); - // IE BUG: When destroying editor DOM with the selection remains inside // editing area would break IE7/8's selection system, we have to put the editing // iframe offline first. (#3812 and #5441) From 92aeeecac9edc5d273f572d8e91abf4ba3e55597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Tue, 7 Jan 2014 15:58:41 +0100 Subject: [PATCH 2/2] Changelog entries. --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index e2657afa304..ceaf72f196b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,8 @@ CKEditor 4 Changelog * [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in `sourcedialog` plugin. * [#11133](http://dev.ckeditor.com/ticket/11133): [Pagebreak](http://ckeditor.com/addon/pagebreak) becomes editable if pasted. * [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native undo executed once reached the bottom of snapshot stack. +* [#11131](http://dev.ckeditor.com/ticket/11131): [[Divarea](http://ckeditor.com/addon/divarea)] Fixed: Error thrown when switching to source mode if selection was in widget's nested editable. +* [#11139](http://dev.ckeditor.com/ticket/11139): [[Divarea](http://ckeditor.com/addon/divarea)] Fixed: Elements path is not cleared after switching to source mode. ## CKEditor 4.3.1