X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=1e06a6ae554323f31952bceb25c2c1838d8eb630;hb=refs%2Ftags%2Fv3.0.2;hp=283c5f77bf82ea0c7dcd5ad0193e0b796264922e;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js index 283c5f7..1e06a6a 100644 --- a/_source/plugins/link/dialogs/link.js +++ b/_source/plugins/link/dialogs/link.js @@ -37,7 +37,8 @@ CKEDITOR.dialog.add( 'link', function( editor ) var dialog = this.getDialog(), partIds = [ 'urlOptions', 'anchorOptions', 'emailOptions' ], typeValue = this.getValue(), - uploadInitiallyHidden = dialog.definition.getContents( 'upload' ).hidden; + uploadTab = dialog.definition.getContents( 'upload' ), + uploadInitiallyHidden = uploadTab && uploadTab.hidden; if ( typeValue == 'url' ) { @@ -304,7 +305,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) setup : function( data ) { if ( data.url ) - this.setValue( data.url.protocol ); + this.setValue( data.url.protocol || '' ); }, commit : function( data ) { @@ -1105,6 +1106,9 @@ CKEDITOR.dialog.add( 'link', function( editor ) { if ( data.target.type != 'notSet' && data.target.name ) attributes.target = data.target.name; + else + removeAttributes.push( 'target' ); + removeAttributes.push( '_cke_pa_onclick', 'onclick' ); } }