Skip to content
Permalink
Browse files

Merge branch 't/10912'

  • Loading branch information...
Reinmar committed Oct 7, 2013
2 parents 14c2a15 + 67b4e78 commit 6b9293d8743770597695b300abf49f960e26952c
Showing with 10 additions and 7 deletions.
  1. +1 −0 CHANGES.md
  2. +9 −7 core/editable.js
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#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.
* [#10910](http://dev.ckeditor.com/ticket/10910): Fixed error thrown on Internet Explorer 9 in Compatibility Mode.
@@ -514,13 +514,15 @@
// Pass this configuration to styles system.
this.setCustomData( 'cke_includeReadonly', !editor.config.disableReadonlyStyling );

// Prevent the browser opening read-only links. (#6032)
this.attachListener( this, 'click', function( ev ) {
ev = ev.data;
var target = ev.getTarget();
if ( target.is( 'a' ) && ev.$.button != 2 && target.isReadOnly() )
ev.preventDefault();
});
// Prevent the browser opening read-only links. (#6032 & #10912)
this.attachListener( this, 'click', function( evt ) {
evt = evt.data;

var link = new CKEDITOR.dom.elementPath( evt.getTarget(), this ).contains( 'a' );

if ( link && evt.$.button != 2 && link.isReadOnly() )
evt.preventDefault();
} );

// Override keystrokes which should have deletion behavior
// on fully selected element . (#4047) (#7645)

0 comments on commit 6b9293d

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