vanilla ckeditor-3.0.2

[ckeditor.git] / _source / plugins / link / dialogs / link.js

diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js
index 283c5f7..1e06a6a 100644 (file)
--- 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(),\r
                        partIds = [ 'urlOptions', 'anchorOptions', 'emailOptions' ],\r
                        typeValue = this.getValue(),\r
-                       uploadInitiallyHidden = dialog.definition.getContents( 'upload' ).hidden;\r
+                       uploadTab = dialog.definition.getContents( 'upload' ),\r
+                       uploadInitiallyHidden = uploadTab && uploadTab.hidden;\r
 \r
                if ( typeValue == 'url' )\r
                {\r
@@ -304,7 +305,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                                                                setup : function( data )\r
                                                                                {\r
                                                                                        if ( data.url )\r
-                                                                                               this.setValue( data.url.protocol );\r
+                                                                                               this.setValue( data.url.protocol || '' );\r
                                                                                },\r
                                                                                commit : function( data )\r
                                                                                {\r
@@ -1105,6 +1106,9 @@ CKEDITOR.dialog.add( 'link', function( editor )
                                {\r
                                        if ( data.target.type != 'notSet' && data.target.name )\r
                                                attributes.target = data.target.name;\r
+                                       else\r
+                                               removeAttributes.push( 'target' );\r
+\r
                                        removeAttributes.push( '_cke_pa_onclick', 'onclick' );\r
                                }\r
                        }\r