Skip to content
Permalink
Browse files

Merge branch 't/10945'

  • Loading branch information...
pjasiun committed Oct 7, 2013
2 parents 6b9293d + 8e760e8 commit 5d8d34a173aecf2f2bc8320b0f8ca66a44c58b57
Showing with 7 additions and 0 deletions.
  1. +1 −0 CHANGES.md
  2. +6 −0 plugins/wysiwygarea/plugin.js
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#10945](http://dev.ckeditor.com/ticket/10945): Click with mouse inside editor does not show the caret, but user is able to enter text.
* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed CKEDITOR.plugins.addExternal not handling paths including file name specified.
* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed CKEDITOR.tools.isArray not working cross frame.
@@ -180,6 +180,12 @@
}, 0 );
}
});
} else if ( CKEDITOR.env.webkit ) {
// Fix problem with cursor not appearing in Chrome when clicking below the body (#10945).
doc.getDocumentElement().on( 'mousedown', function( evt ) {
if ( evt.data.getTarget().is( 'html' ) )
editor.editable().focus();
} );
}

// ## START : disableNativeTableHandles and disableObjectResizing settings.

0 comments on commit 5d8d34a

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