Merge branch 't/13609'

ckeditor · Aug 3, 2015 · 3974e8a · 3974e8a
2 parents 4d78990 + f6c66e2
commit 3974e8a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/dom/node.js b/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