X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=56baa05b7291700c4a69ab86683429cc95a23335;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=57c483ca852dc946ff041a71eeef5059996584e2;hpb=8665a7c6c60586526e32e8941fe2896739b6ebfb;p=ckeditor.git
diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js
index 57c483c..56baa05 100644
--- a/_source/plugins/link/dialogs/link.js
+++ b/_source/plugins/link/dialogs/link.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -75,6 +75,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
else
element.hide();
}
+
+ dialog.layout();
};
// Loads the parameters in a selected link to the link dialog fields.
@@ -94,7 +96,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
var parseLink = function( editor, element )
{
- var href = ( element && ( element.getAttribute( '_cke_saved_href' ) || element.getAttribute( 'href' ) ) ) || '',
+ var href = ( element && ( element.data( 'cke-saved-href' ) || element.getAttribute( 'href' ) ) ) || '',
javascriptMatch,
emailMatch,
anchorMatch,
@@ -184,7 +186,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
// IE BUG: target attribute is an empty string instead of null in IE if it's not set.
if ( !target )
{
- var onclick = element.getAttribute( '_cke_pa_onclick' ) || element.getAttribute( 'onclick' ),
+ var onclick = element.data( 'cke-pa-onclick' ) || element.getAttribute( 'onclick' ),
onclickMatch = onclick && onclick.match( popupRegex );
if ( onclickMatch )
{
@@ -223,7 +225,11 @@ CKEDITOR.dialog.add( 'link', function( editor )
advAttr( 'advId', 'id' );
advAttr( 'advLangDir', 'dir' );
advAttr( 'advAccessKey', 'accessKey' );
- advAttr( 'advName', 'name' );
+
+ retval.adv.advName =
+ element.data( 'cke-saved-name' )
+ || element.getAttribute( 'name' )
+ || '';
advAttr( 'advLangCode', 'lang' );
advAttr( 'advTabIndex', 'tabindex' );
advAttr( 'advTitle', 'title' );
@@ -242,10 +248,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
for ( var i = 0; i < elements.count() ; i++ )
{
var item = elements.getItem( i );
- if ( item.getAttribute( '_cke_realelement' ) && item.getAttribute( '_cke_real_element_type' ) == 'anchor' )
- {
+ if ( item.data( 'cke-realelement' ) && item.data( 'cke-real-element-type' ) == 'anchor' )
anchors.push( editor.restoreRealElement( item ) );
- }
}
for ( i = 0 ; i < realAnchors.count() ; i++ )
@@ -363,27 +367,30 @@ CKEDITOR.dialog.add( 'link', function( editor )
return 'String.fromCharCode(' + encodedChars.join( ',' ) + ')';
}
+ var commonLang = editor.lang.common,
+ linkLang = editor.lang.link;
+
return {
- title : editor.lang.link.title,
+ title : linkLang.title,
minWidth : 350,
minHeight : 230,
contents : [
{
id : 'info',
- label : editor.lang.link.info,
- title : editor.lang.link.info,
+ label : linkLang.info,
+ title : linkLang.info,
elements :
[
{
id : 'linkType',
type : 'select',
- label : editor.lang.link.type,
+ label : linkLang.type,
'default' : 'url',
items :
[
- [ editor.lang.link.toUrl, 'url' ],
- [ editor.lang.link.toAnchor, 'anchor' ],
- [ editor.lang.link.toEmail, 'email' ]
+ [ linkLang.toUrl, 'url' ],
+ [ linkLang.toAnchor, 'anchor' ],
+ [ linkLang.toEmail, 'email' ]
],
onChange : linkTypeChanged,
setup : function( data )
@@ -409,7 +416,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
id : 'protocol',
type : 'select',
- label : editor.lang.common.protocol,
+ label : commonLang.protocol,
'default' : 'http://',
items :
[
@@ -418,7 +425,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[ 'https://\u200E', 'https://' ],
[ 'ftp://\u200E', 'ftp://' ],
[ 'news://\u200E', 'news://' ],
- [ editor.lang.link.other , '' ]
+ [ linkLang.other , '' ]
],
setup : function( data )
{
@@ -436,7 +443,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
id : 'url',
- label : editor.lang.common.url,
+ label : commonLang.url,
required: true,
onLoad : function ()
{
@@ -447,8 +454,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
this.allowOnChange = false;
var protocolCmb = this.getDialog().getContentElement( 'info', 'protocol' ),
url = this.getValue(),
- urlOnChangeProtocol = /^(http|https|ftp|news):\/\/(?=.)/gi,
- urlOnChangeTestOther = /^((javascript:)|[#\/\.\?])/gi;
+ urlOnChangeProtocol = /^(http|https|ftp|news):\/\/(?=.)/i,
+ urlOnChangeTestOther = /^((javascript:)|[#\/\.\?])/i;
var protocol = urlOnChangeProtocol.exec( url );
if ( protocol )
@@ -477,7 +484,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
if ( this.getDialog().fakeObj ) // Edit Anchor.
return true;
- var func = CKEDITOR.dialog.validate.notEmpty( editor.lang.link.noUrl );
+ var func = CKEDITOR.dialog.validate.notEmpty( linkLang.noUrl );
return func.apply( this );
},
setup : function( data )
@@ -513,7 +520,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
id : 'browse',
hidden : 'true',
filebrowser : 'info:url',
- label : editor.lang.common.browseServer
+ label : commonLang.browseServer
}
]
},
@@ -528,7 +535,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'fieldset',
id : 'selectAnchorText',
- label : editor.lang.link.selectAnchor,
+ label : linkLang.selectAnchor,
setup : function( data )
{
if ( data.anchors.length > 0 )
@@ -547,7 +554,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'select',
id : 'anchorName',
'default' : '',
- label : editor.lang.link.anchorName,
+ label : linkLang.anchorName,
style : 'width: 100%;',
items :
[
@@ -582,7 +589,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'select',
id : 'anchorId',
'default' : '',
- label : editor.lang.link.anchorId,
+ label : linkLang.anchorId,
style : 'width: 100%;',
items :
[
@@ -624,7 +631,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'html',
id : 'noAnchors',
style : 'text-align: center;',
- html : '' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '
',
+ html : '' + CKEDITOR.tools.htmlEncode( linkLang.noAnchors ) + '
',
// Focus the first element defined in above html.
focus : true,
setup : function( data )
@@ -651,7 +658,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
id : 'emailAddress',
- label : editor.lang.link.emailAddress,
+ label : linkLang.emailAddress,
required : true,
validate : function()
{
@@ -661,7 +668,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
dialog.getValueOf( 'info', 'linkType' ) != 'email' )
return true;
- var func = CKEDITOR.dialog.validate.notEmpty( editor.lang.link.noEmail );
+ var func = CKEDITOR.dialog.validate.notEmpty( linkLang.noEmail );
return func.apply( this );
},
setup : function( data )
@@ -684,7 +691,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
id : 'emailSubject',
- label : editor.lang.link.emailSubject,
+ label : linkLang.emailSubject,
setup : function( data )
{
if ( data.email )
@@ -701,7 +708,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'textarea',
id : 'emailBody',
- label : editor.lang.link.emailBody,
+ label : linkLang.emailBody,
rows : 3,
'default' : '',
setup : function( data )
@@ -728,8 +735,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
id : 'target',
- label : editor.lang.link.target,
- title : editor.lang.link.target,
+ label : linkLang.target,
+ title : linkLang.target,
elements :
[
{
@@ -740,24 +747,25 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'select',
id : 'linkTargetType',
- label : editor.lang.common.target,
+ label : commonLang.target,
'default' : 'notSet',
style : 'width : 100%;',
'items' :
[
- [ editor.lang.common.notSet, 'notSet' ],
- [ editor.lang.link.targetFrame, 'frame' ],
- [ editor.lang.link.targetPopup, 'popup' ],
- [ editor.lang.common.targetNew, '_blank' ],
- [ editor.lang.common.targetTop, '_top' ],
- [ editor.lang.common.targetSelf, '_self' ],
- [ editor.lang.common.targetParent, '_parent' ]
+ [ commonLang.notSet, 'notSet' ],
+ [ linkLang.targetFrame, 'frame' ],
+ [ linkLang.targetPopup, 'popup' ],
+ [ commonLang.targetNew, '_blank' ],
+ [ commonLang.targetTop, '_top' ],
+ [ commonLang.targetSelf, '_self' ],
+ [ commonLang.targetParent, '_parent' ]
],
onChange : targetChanged,
setup : function( data )
{
if ( data.target )
- this.setValue( data.target.type );
+ this.setValue( data.target.type || 'notSet' );
+ targetChanged.call( this );
},
commit : function( data )
{
@@ -770,7 +778,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
id : 'linkTargetName',
- label : editor.lang.link.targetFrameName,
+ label : linkLang.targetFrameName,
'default' : '',
setup : function( data )
{
@@ -789,7 +797,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
type : 'vbox',
- width : 260,
+ width : '100%',
align : 'center',
padding : 2,
id : 'popupFeatures',
@@ -797,7 +805,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'fieldset',
- label : editor.lang.link.popupFeatures,
+ label : linkLang.popupFeatures,
children :
[
{
@@ -807,14 +815,14 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'resizable',
- label : editor.lang.link.popupResizable,
+ label : linkLang.popupResizable,
setup : setupPopupParams,
commit : commitPopupParams
},
{
type : 'checkbox',
id : 'status',
- label : editor.lang.link.popupStatusBar,
+ label : linkLang.popupStatusBar,
setup : setupPopupParams,
commit : commitPopupParams
@@ -828,7 +836,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'location',
- label : editor.lang.link.popupLocationBar,
+ label : linkLang.popupLocationBar,
setup : setupPopupParams,
commit : commitPopupParams
@@ -836,7 +844,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'toolbar',
- label : editor.lang.link.popupToolbar,
+ label : linkLang.popupToolbar,
setup : setupPopupParams,
commit : commitPopupParams
@@ -850,7 +858,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'menubar',
- label : editor.lang.link.popupMenuBar,
+ label : linkLang.popupMenuBar,
setup : setupPopupParams,
commit : commitPopupParams
@@ -858,7 +866,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'fullscreen',
- label : editor.lang.link.popupFullScreen,
+ label : linkLang.popupFullScreen,
setup : setupPopupParams,
commit : commitPopupParams
@@ -872,7 +880,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'scrollbars',
- label : editor.lang.link.popupScrollBars,
+ label : linkLang.popupScrollBars,
setup : setupPopupParams,
commit : commitPopupParams
@@ -880,7 +888,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'checkbox',
id : 'dependent',
- label : editor.lang.link.popupDependent,
+ label : linkLang.popupDependent,
setup : setupPopupParams,
commit : commitPopupParams
@@ -893,9 +901,9 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'text',
- widths : [ '30%', '70%' ],
+ widths : [ '50%', '50%' ],
labelLayout : 'horizontal',
- label : editor.lang.link.popupWidth,
+ label : commonLang.width,
id : 'width',
setup : setupPopupParams,
commit : commitPopupParams
@@ -904,8 +912,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
labelLayout : 'horizontal',
- widths : [ '55%', '45%' ],
- label : editor.lang.link.popupLeft,
+ widths : [ '50%', '50%' ],
+ label : linkLang.popupLeft,
id : 'left',
setup : setupPopupParams,
commit : commitPopupParams
@@ -920,8 +928,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
labelLayout : 'horizontal',
- widths : [ '30%', '70%' ],
- label : editor.lang.link.popupHeight,
+ widths : [ '50%', '50%' ],
+ label : commonLang.height,
id : 'height',
setup : setupPopupParams,
commit : commitPopupParams
@@ -930,8 +938,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
labelLayout : 'horizontal',
- label : editor.lang.link.popupTop,
- widths : [ '55%', '45%' ],
+ label : linkLang.popupTop,
+ widths : [ '50%', '50%' ],
id : 'top',
setup : setupPopupParams,
commit : commitPopupParams
@@ -947,8 +955,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
id : 'upload',
- label : editor.lang.link.upload,
- title : editor.lang.link.upload,
+ label : linkLang.upload,
+ title : linkLang.upload,
hidden : true,
filebrowser : 'uploadButton',
elements :
@@ -956,14 +964,14 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'file',
id : 'upload',
- label : editor.lang.common.upload,
+ label : commonLang.upload,
style: 'height:40px',
size : 29
},
{
type : 'fileButton',
id : 'uploadButton',
- label : editor.lang.common.uploadSubmit,
+ label : commonLang.uploadSubmit,
filebrowser : 'info:url',
'for' : [ 'upload', 'upload' ]
}
@@ -971,8 +979,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
id : 'advanced',
- label : editor.lang.link.advanced,
- title : editor.lang.link.advanced,
+ label : linkLang.advanced,
+ title : linkLang.advanced,
elements :
[
{
@@ -988,21 +996,21 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
type : 'text',
id : 'advId',
- label : editor.lang.link.id,
+ label : linkLang.id,
setup : setupAdvParams,
commit : commitAdvParams
},
{
type : 'select',
id : 'advLangDir',
- label : editor.lang.link.langDir,
+ label : linkLang.langDir,
'default' : '',
style : 'width:110px',
items :
[
- [ editor.lang.common.notSet, '' ],
- [ editor.lang.link.langDirLTR, 'ltr' ],
- [ editor.lang.link.langDirRTL, 'rtl' ]
+ [ commonLang.notSet, '' ],
+ [ linkLang.langDirLTR, 'ltr' ],
+ [ linkLang.langDirRTL, 'rtl' ]
],
setup : setupAdvParams,
commit : commitAdvParams
@@ -1011,7 +1019,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
type : 'text',
id : 'advAccessKey',
width : '80px',
- label : editor.lang.link.acccessKey,
+ label : linkLang.acccessKey,
maxLength : 1,
setup : setupAdvParams,
commit : commitAdvParams
@@ -1026,7 +1034,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'text',
- label : editor.lang.link.name,
+ label : linkLang.name,
id : 'advName',
setup : setupAdvParams,
commit : commitAdvParams
@@ -1034,7 +1042,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
type : 'text',
- label : editor.lang.link.langCode,
+ label : linkLang.langCode,
id : 'advLangCode',
width : '110px',
'default' : '',
@@ -1044,7 +1052,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
type : 'text',
- label : editor.lang.link.tabIndex,
+ label : linkLang.tabIndex,
id : 'advTabIndex',
width : '80px',
maxLength : 5,
@@ -1068,7 +1076,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'text',
- label : editor.lang.link.advisoryTitle,
+ label : linkLang.advisoryTitle,
'default' : '',
id : 'advTitle',
setup : setupAdvParams,
@@ -1077,7 +1085,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
type : 'text',
- label : editor.lang.link.advisoryContentType,
+ label : linkLang.advisoryContentType,
'default' : '',
id : 'advContentType',
setup : setupAdvParams,
@@ -1093,7 +1101,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'text',
- label : editor.lang.link.cssClasses,
+ label : linkLang.cssClasses,
'default' : '',
id : 'advCSSClasses',
setup : setupAdvParams,
@@ -1102,7 +1110,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
{
type : 'text',
- label : editor.lang.link.charset,
+ label : linkLang.charset,
'default' : '',
id : 'advCharset',
setup : setupAdvParams,
@@ -1117,7 +1125,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
[
{
type : 'text',
- label : editor.lang.link.styles,
+ label : linkLang.styles,
'default' : '',
id : 'advStyles',
setup : setupAdvParams,
@@ -1143,8 +1151,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
if ( ( element = plugin.getSelectedLink( editor ) ) && element.hasAttribute( 'href' ) )
selection.selectElement( element );
else if ( ( element = selection.getSelectedElement() ) && element.is( 'img' )
- && element.getAttribute( '_cke_real_element_type' )
- && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+ && element.data( 'cke-real-element-type' )
+ && element.data( 'cke-real-element-type' ) == 'anchor' )
{
this.fakeObj = element;
element = editor.restoreRealElement( this.fakeObj );
@@ -1157,9 +1165,9 @@ CKEDITOR.dialog.add( 'link', function( editor )
},
onOk : function()
{
- var attributes = { href : 'javascript:void(0)/*' + CKEDITOR.tools.getNextNumber() + '*/' },
+ var attributes = {},
removeAttributes = [],
- data = { href : attributes.href },
+ data = {},
me = this,
editor = this.getParentEditor();
@@ -1171,12 +1179,12 @@ CKEDITOR.dialog.add( 'link', function( editor )
case 'url':
var protocol = ( data.url && data.url.protocol != undefined ) ? data.url.protocol : 'http://',
url = ( data.url && data.url.url ) || '';
- attributes._cke_saved_href = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;
+ attributes[ 'data-cke-saved-href' ] = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;
break;
case 'anchor':
var name = ( data.anchor && data.anchor.name ),
id = ( data.anchor && data.anchor.id );
- attributes._cke_saved_href = '#' + ( name || id || '' );
+ attributes[ 'data-cke-saved-href' ] = '#' + ( name || id || '' );
break;
case 'email':
@@ -1223,7 +1231,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
}
}
- attributes._cke_saved_href = linkHref.join( '' );
+ attributes[ 'data-cke-saved-href' ] = linkHref.join( '' );
break;
}
@@ -1251,7 +1259,10 @@ CKEDITOR.dialog.add( 'link', function( editor )
addFeature( 'top' );
onclickList.push( featureList.join( ',' ), '\'); return false;' );
- attributes[ '_cke_pa_onclick' ] = onclickList.join( '' );
+ attributes[ 'data-cke-pa-onclick' ] = onclickList.join( '' );
+
+ // Add the "target" attribute. (#5074)
+ removeAttributes.push( 'target' );
}
else
{
@@ -1260,7 +1271,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
else
removeAttributes.push( 'target' );
- removeAttributes.push( '_cke_pa_onclick', 'onclick' );
+ removeAttributes.push( 'data-cke-pa-onclick', 'onclick' );
}
}
@@ -1276,11 +1287,18 @@ CKEDITOR.dialog.add( 'link', function( editor )
removeAttributes.push( attrName );
};
- if ( this._.selectedElement )
- advAttr( 'advId', 'id' );
+ advAttr( 'advId', 'id' );
advAttr( 'advLangDir', 'dir' );
advAttr( 'advAccessKey', 'accessKey' );
- advAttr( 'advName', 'name' );
+
+ if ( data.adv[ 'advName' ] )
+ {
+ attributes[ 'name' ] = attributes[ 'data-cke-saved-name' ] = data.adv[ 'advName' ];
+ attributes[ 'class' ] = ( attributes[ 'class' ] ? attributes[ 'class' ] + ' ' : '' ) + 'cke_anchor';
+ }
+ else
+ removeAttributes = removeAttributes.concat( [ 'data-cke-saved-name', 'name' ] );
+
advAttr( 'advLangCode', 'lang' );
advAttr( 'advTabIndex', 'tabindex' );
advAttr( 'advTitle', 'title' );
@@ -1290,14 +1308,20 @@ CKEDITOR.dialog.add( 'link', function( editor )
advAttr( 'advStyles', 'style' );
}
+
+ // Browser need the "href" fro copy/paste link to work. (#6641)
+ attributes.href = attributes[ 'data-cke-saved-href' ];
+
if ( !this._.selectedElement )
{
// Create element if current selection is collapsed.
var selection = editor.getSelection(),
- ranges = selection.getRanges();
+ ranges = selection.getRanges( true );
if ( ranges.length == 1 && ranges[0].collapsed )
{
- var text = new CKEDITOR.dom.text( attributes._cke_saved_href, editor.document );
+ // Short mailto link text view (#5736).
+ var text = new CKEDITOR.dom.text( data.type == 'email' ?
+ data.email.address : attributes[ 'data-cke-saved-href' ], editor.document );
ranges[0].insertNode( text );
ranges[0].selectNodeContents( text );
selection.selectRanges( ranges );
@@ -1307,26 +1331,12 @@ CKEDITOR.dialog.add( 'link', function( editor )
var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
style.type = CKEDITOR.STYLE_INLINE; // need to override... dunno why.
style.apply( editor.document );
-
- // Id. Apply only to the first link.
- if ( data.adv && data.adv.advId )
- {
- var links = this.getParentEditor().document.$.getElementsByTagName( 'a' );
- for ( i = 0 ; i < links.length ; i++ )
- {
- if ( links[i].href == attributes.href )
- {
- links[i].id = data.adv.advId;
- break;
- }
- }
- }
}
else
{
// We're only editing an existing link, so just overwrite the attributes.
var element = this._.selectedElement,
- href = element.getAttribute( '_cke_saved_href' ),
+ href = element.data( 'cke-saved-href' ),
textView = element.getHtml();
// IE BUG: Setting the name attribute to an existing link doesn't work.
@@ -1338,8 +1348,8 @@ CKEDITOR.dialog.add( 'link', function( editor )
selection = editor.getSelection();
- element.moveChildren( newElement );
element.copyAttributes( newElement, { name : 1 } );
+ element.moveChildren( newElement );
newElement.replace( element );
element = newElement;
@@ -1348,9 +1358,13 @@ CKEDITOR.dialog.add( 'link', function( editor )
element.setAttributes( attributes );
element.removeAttributes( removeAttributes );
- // Update text view when user changes protocol #4612.
- if (href == textView)
- element.setHtml( attributes._cke_saved_href );
+ // Update text view when user changes protocol (#4612).
+ if ( href == textView || data.type == 'email' && textView.indexOf( '@' ) != -1 )
+ {
+ // Short mailto link text view (#5736).
+ element.setHtml( data.type == 'email' ?
+ data.email.address : attributes[ 'data-cke-saved-href' ] );
+ }
// Make the element display as an anchor if a name has been set.
if ( element.getAttribute( 'name' ) )
element.addClass( 'cke_anchor' );
@@ -1377,7 +1391,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
{
var linkType = this.getContentElement( 'info', 'linkType' ),
urlField;
- if ( linkType && linkType.getValue( ) == 'url' )
+ if ( linkType && linkType.getValue() == 'url' )
{
urlField = this.getContentElement( 'info', 'url' );
urlField.select();