Skip to content
Permalink
Browse files

Merge branch 't/11641'

  • Loading branch information...
pjasiun committed Mar 14, 2014
2 parents 5cd42b7 + d9f684c commit eec6b82865b297e750f6b96f825a0bbbbb47f1f4
Showing with 13 additions and 11 deletions.
  1. +1 −1 CHANGES.md
  2. +12 −10 core/editable.js
@@ -13,7 +13,7 @@ Fixed Issues:
* [#9205](http://dev.ckeditor.com/ticket/9205), [#7805](http://dev.ckeditor.com/ticket/7805), [#8216](http://dev.ckeditor.com/ticket/8216): Fixed: `{cke_protected_1}` appearing in data in various cases where HTML comments are placed next to `"` or `'`.
* [#11635](http://dev.ckeditor.com/ticket/11635): Fixed: Some attributes are not protected before content is passed through fix bin.
* [#11660](http://dev.ckeditor.com/ticket/11660): [IE] Fixed: Content of a table is lost when there is some extra markup inside a table.

* [#11641](http://dev.ckeditor.com/ticket/11641): Fixed: Switching between modes in framed editor removes content styles for inline editor.

## CKEditor 4.3.3

@@ -801,16 +801,18 @@
}

// Remove contents stylesheet from document if it's the last usage.
var doc = this.getDocument(),
head = doc.getHead();
if ( head.getCustomData( 'stylesheet' ) ) {
var refs = doc.getCustomData( 'stylesheet_ref' );
if ( !( --refs ) ) {
doc.removeCustomData( 'stylesheet_ref' );
var sheet = head.removeCustomData( 'stylesheet' );
sheet.remove();
} else
doc.setCustomData( 'stylesheet_ref', refs );
if ( !this.is( 'textarea' ) ) {
var doc = this.getDocument(),
head = doc.getHead();
if ( head.getCustomData( 'stylesheet' ) ) {
var refs = doc.getCustomData( 'stylesheet_ref' );
if ( !( --refs ) ) {
doc.removeCustomData( 'stylesheet_ref' );
var sheet = head.removeCustomData( 'stylesheet' );
sheet.remove();
} else
doc.setCustomData( 'stylesheet_ref', refs );
}
}

this.editor.fire( 'contentDomUnload' );

0 comments on commit eec6b82

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