Skip to content

Commit

Permalink
Merge branch 't/10906b' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Oct 31, 2013
2 parents cc0310f + d08ecca commit 4db3dbb
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions plugins/wysiwygarea/plugin.js
Expand Up @@ -179,12 +179,19 @@
}
}, 0 );
}
});
} else if ( CKEDITOR.env.webkit ) {
// Fix problem with cursor not appearing in Chrome when clicking below the body (#10945).
} );
}

// Fix problem with cursor not appearing in Webkit and IE11+ when clicking below the body (#10945, #10906).
// Fix for older IEs (8-10 and QM) is placed inside selection.js.
if ( CKEDITOR.env.webkit || ( CKEDITOR.env.ie && CKEDITOR.env.version > 10 ) ) {
doc.getDocumentElement().on( 'mousedown', function( evt ) {
if ( evt.data.getTarget().is( 'html' ) )
editor.editable().focus();
if ( evt.data.getTarget().is( 'html' ) ) {
// IE needs this timeout. Webkit does not, but it does not cause problems too.
setTimeout( function() {
editor.editable().focus();
} );
}
} );
}

Expand Down

0 comments on commit 4db3dbb

Please sign in to comment.