Skip to content
Permalink
Browse files

Merge branch 't/13609'

  • Loading branch information...
scofalik committed Aug 3, 2015
2 parents 4d78990 + f6c66e2 commit 3974e8a0f9a2328fa731cb1763132b57e965b627
Showing with 7 additions and 1 deletion.
  1. +7 −1 core/dom/node.js
@@ -818,8 +818,14 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype, {
if ( this.type != CKEDITOR.NODE_ELEMENT )
element = this.getParent();

if ( !checkOnlyAttributes && element && typeof element.$.isContentEditable != 'undefined' )
// Prevent Edge crash. #13609.
if ( CKEDITOR.env.edge && element && element.is( 'textarea' ) ) {
checkOnlyAttributes = true;
}

if ( !checkOnlyAttributes && element && typeof element.$.isContentEditable != 'undefined' ) {
return !( element.$.isContentEditable || element.data( 'cke-editable' ) );
}
else {
// Degrade for old browsers which don't support "isContentEditable", e.g. FF3

0 comments on commit 3974e8a

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