Skip to content
Permalink
Browse files

Merge branch 't/9661'

  • Loading branch information...
adelura committed May 8, 2014
2 parents 0f68337 + 9b11b6c commit d971319f049fbe0d0ebe4545882ab39e6942530b
Showing with 16 additions and 1 deletion.
  1. +1 −0 CHANGES.md
  2. +1 −1 plugins/link/dialogs/link.js
  3. +14 −0 plugins/link/plugin.js
@@ -4,6 +4,7 @@ CKEditor 4 Changelog
## CKEditor 4.4.1

Fixed Issues:
* [#9661](http://dev.ckeditor.com/ticket/9661): Added optional, configurable possibility to set JavaScript code in `href` attribute in anchor tags.
* [#11809](http://dev.ckeditor.com/ticket/11809): Set indentation to four spaces in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the title element.
* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin from required in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
@@ -201,7 +201,7 @@
if ( dialog.getContentElement( 'info', 'linkType' ) && dialog.getValueOf( 'info', 'linkType' ) != 'url' )
return true;

if ( ( /javascript\:/ ).test( this.getValue() ) ) {
if ( !editor.config.linkJavaScriptLinksAllowed && ( /javascript\:/ ).test( this.getValue() ) ) {
alert( commonLang.invalidValue );
return false;
}
@@ -754,5 +754,19 @@
* @member CKEDITOR.config
*/
linkShowTargetTab: true

/**
* Whether JavaScript code is allowed as a `href` attribute in anchor tag.
* With this option enabled it is possible to create links like:
*
* <a href="javascript:alert('Hello world!')">hello world</a>
*
* By default JavaScript links are not allowed and will not pass
* the dialog validation.
*
* @since 4.4.1
* @cfg {Boolean} [linkJavaScriptLinksAllowed=false]
* @member CKEDITOR.config
*/
} );
} )();

0 comments on commit d971319

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