Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/11131b'
  • Loading branch information
Reinmar committed Jan 7, 2014
2 parents 2a6a54b + 92aeeec commit 2699ee7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions core/editable.js
Expand Up @@ -774,6 +774,8 @@
doc.setCustomData( 'stylesheet_ref', refs );
}

this.editor.fire( 'contentDomUnload' );

// Free up the editor reference.
delete this.editor;
}
Expand Down
3 changes: 0 additions & 3 deletions plugins/wysiwygarea/plugin.js
Expand Up @@ -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)
Expand Down

0 comments on commit 2699ee7

Please sign in to comment.