Skip to content
Permalink
Browse files

Merge branch 't/13785'

  • Loading branch information...
mlewand committed Oct 21, 2015
2 parents e634323 + d6390a5 commit e4f24321591de46716f3fac1130e7c5f60629018
Showing with 5 additions and 4 deletions.
  1. +5 −0 plugins/wysiwygarea/plugin.js
  2. +0 −4 tests/plugins/removeformat/plugin.js
@@ -154,6 +154,11 @@

var editable = this;

// Without it IE8 has problem with removing selection in nested editable. (#13785)
if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
doc.getDocumentElement().addClass( doc.$.compatMode );
}

// Prevent IE/Edge from leaving a new paragraph/div after deleting all contents in body. (#6966, #13142)
if ( CKEDITOR.env.ie && !CKEDITOR.env.edge && editor.enterMode != CKEDITOR.ENTER_P ) {
removeSuperfluousElement( 'p' );
@@ -107,10 +107,6 @@ bender.test(
'test remove format selection in nested editable': function() {
var bot = this.editorBot;

if ( CKEDITOR.env.ie && CKEDITOR.env.version == 8 ) {
assert.ignore();
}

bender.tools.selection.setWithHtml( this.editor, '<h1><em>fo{o</em></h1>' +
'<div contenteditable="false">' +
'<div contenteditable="true">' +

0 comments on commit e4f2432

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