X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=51f5623ce699bd20b8e4203659af46eff952fc9e;hb=f0610347140239143439a511ee2bd48cb784f470;hp=8d4e74b5d1ee029bb49632a0f57cf7086504912b;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js index 8d4e74b..51f5623 100644 --- a/_source/plugins/link/dialogs/link.js +++ b/_source/plugins/link/dialogs/link.js @@ -1,10 +1,11 @@ /* -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 */ CKEDITOR.dialog.add( 'link', function( editor ) { + var plugin = CKEDITOR.plugins.link; // Handles the event when the "Target" selection box is changed. var targetChanged = function() { @@ -17,18 +18,26 @@ CKEDITOR.dialog.add( 'link', function( editor ) return; popupFeatures = popupFeatures.getElement(); + popupFeatures.hide(); + targetName.setValue( '' ); + + switch ( value ) + { + case 'frame' : + targetName.setLabel( editor.lang.link.targetFrameName ); + targetName.getElement().show(); + break; + case 'popup' : + popupFeatures.show(); + targetName.setLabel( editor.lang.link.targetPopupName ); + targetName.getElement().show(); + break; + default : + targetName.setValue( value ); + targetName.getElement().hide(); + break; + } - if ( value == 'popup' ) - { - popupFeatures.show(); - targetName.setLabel( editor.lang.link.targetPopupName ); - } - else - { - popupFeatures.hide(); - targetName.setLabel( editor.lang.link.targetFrameName ); - this.getDialog().setValueOf( 'target', 'linkTargetName', value.charAt( 0 ) == '_' ? value : '' ); - } }; // Handles the event when the "Type" selection box is changed. @@ -66,14 +75,17 @@ CKEDITOR.dialog.add( 'link', function( editor ) else element.hide(); } + + dialog.layout(); }; // Loads the parameters in a selected link to the link dialog fields. - var emailRegex = /^mailto:([^?]+)(?:\?(.+))?$/, + var javascriptProtocolRegex = /^javascript:/, + emailRegex = /^mailto:([^?]+)(?:\?(.+))?$/, emailSubjectRegex = /subject=([^;?:@&=$,\/]*)/, emailBodyRegex = /body=([^;?:@&=$,\/]*)/, anchorRegex = /^#(.*)$/, - urlRegex = /^(?!javascript)((?:http|https|ftp|news):\/\/)?(.*)$/, + urlRegex = /^((?:http|https|ftp|news):\/\/)?(.*)$/, selectableTargets = /^(_(?:self|top|parent|blank))$/, encodedEmailLinkRegex = /^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/, functionCallProtectedEmailLinkRegex = /^javascript:([^(]+)\(([^)]+)\)$/; @@ -84,30 +96,16 @@ 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, urlMatch, retval = {}; - if ( ( anchorMatch = href.match( anchorRegex ) ) ) - { - retval.type = 'anchor'; - retval.anchor = {}; - retval.anchor.name = retval.anchor.id = anchorMatch[1]; - } - // urlRegex matches empty strings, so need to check for href as well. - else if ( href && ( urlMatch = href.match( urlRegex ) ) ) + if ( ( javascriptMatch = href.match( javascriptProtocolRegex ) ) ) { - retval.type = 'url'; - retval.url = {}; - retval.url.protocol = urlMatch[1]; - retval.url.url = urlMatch[2]; - } - // Protected email link as encoded string. - else if ( !emailProtection || emailProtection == 'encode' ) - { - if( emailProtection == 'encode' ) + if ( emailProtection == 'encode' ) { href = href.replace( encodedEmailLinkRegex, function ( match, protectedAddress, rest ) @@ -115,12 +113,47 @@ CKEDITOR.dialog.add( 'link', function( editor ) return 'mailto:' + String.fromCharCode.apply( String, protectedAddress.split( ',' ) ) + ( rest && unescapeSingleQuote( rest ) ); - } ); + }); } + // Protected email link as function call. + else if ( emailProtection ) + { + href.replace( functionCallProtectedEmailLinkRegex, function( match, funcName, funcArgs ) + { + if ( funcName == compiledProtectionFunction.name ) + { + retval.type = 'email'; + var email = retval.email = {}; - emailMatch = href.match( emailRegex ); + var paramRegex = /[^,\s]+/g, + paramQuoteRegex = /(^')|('$)/g, + paramsMatch = funcArgs.match( paramRegex ), + paramsMatchLength = paramsMatch.length, + paramName, + paramVal; - if( emailMatch ) + for ( var i = 0; i < paramsMatchLength; i++ ) + { + paramVal = decodeURIComponent( unescapeSingleQuote( paramsMatch[ i ].replace( paramQuoteRegex, '' ) ) ); + paramName = compiledProtectionFunction.params[ i ].toLowerCase(); + email[ paramName ] = paramVal; + } + email.address = [ email.name, email.domain ].join( '@' ); + } + } ); + } + } + + if ( !retval.type ) + { + if ( ( anchorMatch = href.match( anchorRegex ) ) ) + { + retval.type = 'anchor'; + retval.anchor = {}; + retval.anchor.name = retval.anchor.id = anchorMatch[1]; + } + // Protected email link as encoded string. + else if ( ( emailMatch = href.match( emailRegex ) ) ) { var subjectMatch = href.match( emailSubjectRegex ), bodyMatch = href.match( emailBodyRegex ); @@ -131,36 +164,17 @@ CKEDITOR.dialog.add( 'link', function( editor ) subjectMatch && ( email.subject = decodeURIComponent( subjectMatch[ 1 ] ) ); bodyMatch && ( email.body = decodeURIComponent( bodyMatch[ 1 ] ) ); } - } - // Protected email link as function call. - else if( emailProtection ) - { - href.replace( functionCallProtectedEmailLinkRegex, function( match, funcName, funcArgs ) + // urlRegex matches empty strings, so need to check for href as well. + else if ( href && ( urlMatch = href.match( urlRegex ) ) ) { - if( funcName == compiledProtectionFunction.name ) - { - retval.type = 'email'; - var email = retval.email = {}; - - var paramRegex = /[^,\s]+/g, - paramQuoteRegex = /(^')|('$)/g, - paramsMatch = funcArgs.match( paramRegex ), - paramsMatchLength = paramsMatch.length, - paramName, - paramVal; - - for ( var i = 0; i < paramsMatchLength; i++ ) - { - paramVal = decodeURIComponent( unescapeSingleQuote( paramsMatch[ i ].replace( paramQuoteRegex, '' ) ) ); - paramName = compiledProtectionFunction.params[ i ].toLowerCase(); - email[ paramName ] = paramVal; - } - email.address = [ email.name, email.domain ].join( '@' ); - } - } ); + retval.type = 'url'; + retval.url = {}; + retval.url.protocol = urlMatch[1]; + retval.url.url = urlMatch[2]; + } + else + retval.type = 'url'; } - else - retval.type = 'url'; // Load target and popup settings. if ( element ) @@ -172,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 ) { @@ -182,7 +196,8 @@ CKEDITOR.dialog.add( 'link', function( editor ) var featureMatch; while ( ( featureMatch = popupFeaturesRegex.exec( onclickMatch[2] ) ) ) { - if ( featureMatch[2] == 'yes' || featureMatch[2] == '1' ) + // Some values should remain numbers (#7300) + if ( ( featureMatch[2] == 'yes' || featureMatch[2] == '1' ) && !( featureMatch[1] in { height:1, width:1, top:1, left:1 } ) ) retval.target[ featureMatch[1] ] = true; else if ( isFinite( featureMatch[2] ) ) retval.target[ featureMatch[1] ] = featureMatch[2]; @@ -211,43 +226,60 @@ 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' ); advAttr( 'advContentType', 'type' ); - advAttr( 'advCSSClasses', 'class' ); + CKEDITOR.plugins.link.synAnchorSelector ? + retval.adv.advCSSClasses = getLinkClass( element ) + : advAttr( 'advCSSClasses', 'class' ); advAttr( 'advCharset', 'charset' ); advAttr( 'advStyles', 'style' ); + advAttr( 'advRel', 'rel' ); } // Find out whether we have any anchors in the editor. - // Get all IMG elements in CK document. - var elements = editor.document.getElementsByTag( 'img' ), - realAnchors = new CKEDITOR.dom.nodeList( editor.document.$.anchors ), - anchors = retval.anchors = []; + var anchors = retval.anchors = [], + item; - for( var i = 0; i < elements.count() ; i++ ) + // For some browsers we set contenteditable="false" on anchors, making document.anchors not to include them, so we must traverse the links manually (#7893). + if ( CKEDITOR.plugins.link.emptyAnchorFix ) { - var item = elements.getItem( i ); - if ( item.getAttribute( '_cke_realelement' ) && item.getAttribute( '_cke_real_element_type' ) == 'anchor' ) + var links = editor.document.getElementsByTag( 'a' ); + for ( i = 0, count = links.count(); i < count; i++ ) { - anchors.push( editor.restoreRealElement( item ) ); + item = links.getItem( i ); + if ( item.data( 'cke-saved-name' ) || item.hasAttribute( 'name' ) ) + anchors.push( { name : item.data( 'cke-saved-name' ) || item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) } ); + } + } + else + { + var anchorList = new CKEDITOR.dom.nodeList( editor.document.$.anchors ); + for ( var i = 0, count = anchorList.count(); i < count; i++ ) + { + item = anchorList.getItem( i ); + anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) }; } } - for ( i = 0 ; i < realAnchors.count() ; i++ ) - anchors.push( realAnchors.getItem( i ) ); - - for ( i = 0 ; i < anchors.length ; i++ ) + if ( CKEDITOR.plugins.link.fakeAnchor ) { - item = anchors[ i ]; - anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) }; + var imgs = editor.document.getElementsByTag( 'img' ); + for ( i = 0, count = imgs.count(); i < count; i++ ) + { + if ( ( item = CKEDITOR.plugins.link.tryRestoreFakeAnchor( editor, imgs.getItem( i ) ) ) ) + anchors.push( { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) } ); + } } // Record down the selected element in the dialog. this._.selectedElement = element; - return retval; }; @@ -298,7 +330,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) var emailProtection = editor.config.emailProtection || ''; // Compile the protection function pattern. - if( emailProtection && emailProtection != 'encode' ) + if ( emailProtection && emailProtection != 'encode' ) { var compiledProtectionFunction = {}; @@ -351,27 +383,36 @@ CKEDITOR.dialog.add( 'link', function( editor ) return 'String.fromCharCode(' + encodedChars.join( ',' ) + ')'; } + function getLinkClass( ele ) + { + var className = ele.getAttribute( 'class' ); + return className ? className.replace( /\s*(?:cke_anchor_empty|cke_anchor)(?:\s*$)?/g, '' ) : ''; + } + + 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.common.url, '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 ) @@ -397,16 +438,16 @@ CKEDITOR.dialog.add( 'link', function( editor ) { id : 'protocol', type : 'select', - label : editor.lang.common.protocol, + label : commonLang.protocol, 'default' : 'http://', - style : 'width : 100%;', items : [ - [ 'http://' ], - [ 'https://' ], - [ 'ftp://' ], - [ 'news://' ], - [ '', '' ] + // Force 'ltr' for protocol names in BIDI. (#5433) + [ 'http://\u200E', 'http://' ], + [ 'https://\u200E', 'https://' ], + [ 'ftp://\u200E', 'ftp://' ], + [ 'news://\u200E', 'news://' ], + [ linkLang.other , '' ] ], setup : function( data ) { @@ -424,7 +465,8 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'text', id : 'url', - label : editor.lang.common.url, + label : commonLang.url, + required: true, onLoad : function () { this.allowOnChange = true; @@ -434,8 +476,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 ) @@ -464,7 +506,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 ) @@ -474,13 +516,13 @@ CKEDITOR.dialog.add( 'link', function( editor ) this.setValue( data.url.url ); this.allowOnChange = true; - var linkType = this.getDialog().getContentElement( 'info', 'linkType' ); - if ( linkType && linkType.getValue() == 'url' ) - this.select(); - }, commit : function( data ) { + // IE will not trigger the onChange event if the mouse has been used + // to carry all the operations #4724 + this.onChange(); + if ( !data.url ) data.url = {}; @@ -500,7 +542,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) id : 'browse', hidden : 'true', filebrowser : 'info:url', - label : editor.lang.common.browseServer + label : commonLang.browseServer } ] }, @@ -513,105 +555,110 @@ CKEDITOR.dialog.add( 'link', function( editor ) children : [ { - type : 'html', + type : 'fieldset', id : 'selectAnchorText', - html : CKEDITOR.tools.htmlEncode( editor.lang.link.selectAnchor ), + label : linkLang.selectAnchor, setup : function( data ) { if ( data.anchors.length > 0 ) this.getElement().show(); else this.getElement().hide(); - } - }, - { - type : 'html', - id : 'noAnchors', - style : 'text-align: center;', - html : '
' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '
', - setup : function( data ) - { - if ( data.anchors.length < 1 ) - this.getElement().show(); - else - this.getElement().hide(); - } - }, - { - type : 'hbox', - id : 'selectAnchor', + }, children : [ { - type : 'select', - id : 'anchorName', - 'default' : '', - label : editor.lang.link.anchorName, - style : 'width: 100%;', - items : + type : 'hbox', + id : 'selectAnchor', + children : [ - [ '' ] - ], - setup : function( data ) - { - this.clear(); - this.add( '' ); - for ( var i = 0 ; i < data.anchors.length ; i++ ) { - if ( data.anchors[i].name ) - this.add( data.anchors[i].name ); + type : 'select', + id : 'anchorName', + 'default' : '', + label : linkLang.anchorName, + style : 'width: 100%;', + items : + [ + [ '' ] + ], + setup : function( data ) + { + this.clear(); + this.add( '' ); + for ( var i = 0 ; i < data.anchors.length ; i++ ) + { + if ( data.anchors[i].name ) + this.add( data.anchors[i].name ); + } + + if ( data.anchor ) + this.setValue( data.anchor.name ); + + var linkType = this.getDialog().getContentElement( 'info', 'linkType' ); + if ( linkType && linkType.getValue() == 'email' ) + this.focus(); + }, + commit : function( data ) + { + if ( !data.anchor ) + data.anchor = {}; + + data.anchor.name = this.getValue(); + } + }, + { + type : 'select', + id : 'anchorId', + 'default' : '', + label : linkLang.anchorId, + style : 'width: 100%;', + items : + [ + [ '' ] + ], + setup : function( data ) + { + this.clear(); + this.add( '' ); + for ( var i = 0 ; i < data.anchors.length ; i++ ) + { + if ( data.anchors[i].id ) + this.add( data.anchors[i].id ); + } + + if ( data.anchor ) + this.setValue( data.anchor.id ); + }, + commit : function( data ) + { + if ( !data.anchor ) + data.anchor = {}; + + data.anchor.id = this.getValue(); + } } - - if ( data.anchor ) - this.setValue( data.anchor.name ); - - var linkType = this.getDialog().getContentElement( 'info', 'linkType' ); - if ( linkType && linkType.getValue() == 'email' ) - this.focus(); - }, - commit : function( data ) - { - if ( !data.anchor ) - data.anchor = {}; - - data.anchor.name = this.getValue(); - } - }, - { - type : 'select', - id : 'anchorId', - 'default' : '', - label : editor.lang.link.anchorId, - style : 'width: 100%;', - items : - [ - [ '' ] ], setup : function( data ) { - this.clear(); - this.add( '' ); - for ( var i = 0 ; i < data.anchors.length ; i++ ) - { - if ( data.anchors[i].id ) - this.add( data.anchors[i].id ); - } - - if ( data.anchor ) - this.setValue( data.anchor.id ); - }, - commit : function( data ) - { - if ( !data.anchor ) - data.anchor = {}; - - data.anchor.id = this.getValue(); + if ( data.anchors.length > 0 ) + this.getElement().show(); + else + this.getElement().hide(); } } - ], + ] + }, + { + type : 'html', + id : 'noAnchors', + style : 'text-align: center;', + html : '
' + CKEDITOR.tools.htmlEncode( linkLang.noAnchors ) + '
', + // Focus the first element defined in above html. + focus : true, setup : function( data ) { - if ( data.anchors.length > 0 ) + if ( data.anchors.length < 1 ) this.getElement().show(); else this.getElement().hide(); @@ -633,7 +680,8 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'text', id : 'emailAddress', - label : editor.lang.link.emailAddress, + label : linkLang.emailAddress, + required : true, validate : function() { var dialog = this.getDialog(); @@ -642,7 +690,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 ) @@ -665,7 +713,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 ) @@ -682,7 +730,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 ) @@ -709,8 +757,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 : [ { @@ -721,24 +769,25 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'select', id : 'linkTargetType', - label : editor.lang.link.target, + label : commonLang.target, 'default' : 'notSet', style : 'width : 100%;', 'items' : [ - [ editor.lang.link.targetNotSet, 'notSet' ], - [ editor.lang.link.targetFrame, 'frame' ], - [ editor.lang.link.targetPopup, 'popup' ], - [ editor.lang.link.targetNew, '_blank' ], - [ editor.lang.link.targetTop, '_top' ], - [ editor.lang.link.targetSelf, '_self' ], - [ editor.lang.link.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 ) { @@ -751,7 +800,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'text', id : 'linkTargetName', - label : editor.lang.link.targetFrameName, + label : linkLang.targetFrameName, 'default' : '', setup : function( data ) { @@ -763,159 +812,162 @@ CKEDITOR.dialog.add( 'link', function( editor ) if ( !data.target ) data.target = {}; - data.target.name = this.getValue(); + data.target.name = this.getValue().replace(/\W/gi, ''); } } ] }, { type : 'vbox', - width : 260, + width : '100%', align : 'center', padding : 2, id : 'popupFeatures', children : [ { - type : 'html', - html : CKEDITOR.tools.htmlEncode( editor.lang.link.popupFeatures ) - }, - { - type : 'hbox', + type : 'fieldset', + label : linkLang.popupFeatures, children : [ { - type : 'checkbox', - id : 'resizable', - label : editor.lang.link.popupResizable, - setup : setupPopupParams, - commit : commitPopupParams - }, - { - type : 'checkbox', - id : 'status', - label : editor.lang.link.popupStatusBar, - setup : setupPopupParams, - commit : commitPopupParams - - } - ] - }, - { - type : 'hbox', - children : - [ - { - type : 'checkbox', - id : 'location', - label : editor.lang.link.popupLocationBar, - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'checkbox', + id : 'resizable', + label : linkLang.popupResizable, + setup : setupPopupParams, + commit : commitPopupParams + }, + { + type : 'checkbox', + id : 'status', + label : linkLang.popupStatusBar, + setup : setupPopupParams, + commit : commitPopupParams + } + ] }, { - type : 'checkbox', - id : 'toolbar', - label : editor.lang.link.popupToolbar, - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'checkbox', + id : 'location', + label : linkLang.popupLocationBar, + setup : setupPopupParams, + commit : commitPopupParams - } - ] - }, - { - type : 'hbox', - children : - [ - { - type : 'checkbox', - id : 'menubar', - label : editor.lang.link.popupMenuBar, - setup : setupPopupParams, - commit : commitPopupParams + }, + { + type : 'checkbox', + id : 'toolbar', + label : linkLang.popupToolbar, + setup : setupPopupParams, + commit : commitPopupParams + } + ] }, { - type : 'checkbox', - id : 'fullscreen', - label : editor.lang.link.popupFullScreen, - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'checkbox', + id : 'menubar', + label : linkLang.popupMenuBar, + setup : setupPopupParams, + commit : commitPopupParams - } - ] - }, - { - type : 'hbox', - children : - [ - { - type : 'checkbox', - id : 'scrollbars', - label : editor.lang.link.popupScrollBars, - setup : setupPopupParams, - commit : commitPopupParams + }, + { + type : 'checkbox', + id : 'fullscreen', + label : linkLang.popupFullScreen, + setup : setupPopupParams, + commit : commitPopupParams + } + ] }, { - type : 'checkbox', - id : 'dependent', - label : editor.lang.link.popupDependent, - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'checkbox', + id : 'scrollbars', + label : linkLang.popupScrollBars, + setup : setupPopupParams, + commit : commitPopupParams - } - ] - }, - { - type : 'hbox', - children : - [ - { - type : 'text', - widths : [ '30%', '70%' ], - labelLayout : 'horizontal', - label : editor.lang.link.popupWidth, - id : 'width', - setup : setupPopupParams, - commit : commitPopupParams + }, + { + type : 'checkbox', + id : 'dependent', + label : linkLang.popupDependent, + setup : setupPopupParams, + commit : commitPopupParams + } + ] }, { - type : 'text', - labelLayout : 'horizontal', - widths : [ '55%', '45%' ], - label : editor.lang.link.popupLeft, - id : 'left', - setup : setupPopupParams, - commit : commitPopupParams - - } - ] - }, - { - type : 'hbox', - children : - [ - { - type : 'text', - labelLayout : 'horizontal', - widths : [ '30%', '70%' ], - label : editor.lang.link.popupHeight, - id : 'height', - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'text', + widths : [ '50%', '50%' ], + labelLayout : 'horizontal', + label : commonLang.width, + id : 'width', + setup : setupPopupParams, + commit : commitPopupParams + + }, + { + type : 'text', + labelLayout : 'horizontal', + widths : [ '50%', '50%' ], + label : linkLang.popupLeft, + id : 'left', + setup : setupPopupParams, + commit : commitPopupParams + } + ] }, { - type : 'text', - labelLayout : 'horizontal', - label : editor.lang.link.popupTop, - widths : [ '55%', '45%' ], - id : 'top', - setup : setupPopupParams, - commit : commitPopupParams + type : 'hbox', + children : + [ + { + type : 'text', + labelLayout : 'horizontal', + widths : [ '50%', '50%' ], + label : commonLang.height, + id : 'height', + setup : setupPopupParams, + commit : commitPopupParams + + }, + { + type : 'text', + labelLayout : 'horizontal', + label : linkLang.popupTop, + widths : [ '50%', '50%' ], + id : 'top', + setup : setupPopupParams, + commit : commitPopupParams + } + ] } ] } @@ -925,8 +977,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 : @@ -934,14 +986,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' ] } @@ -949,8 +1001,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 : [ { @@ -966,21 +1018,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.link.langDirNotSet, '' ], - [ editor.lang.link.langDirLTR, 'ltr' ], - [ editor.lang.link.langDirRTL, 'rtl' ] + [ commonLang.notSet, '' ], + [ linkLang.langDirLTR, 'ltr' ], + [ linkLang.langDirRTL, 'rtl' ] ], setup : setupAdvParams, commit : commitAdvParams @@ -989,7 +1041,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 @@ -1004,7 +1056,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) [ { type : 'text', - label : editor.lang.link.name, + label : linkLang.name, id : 'advName', setup : setupAdvParams, commit : commitAdvParams @@ -1012,7 +1064,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'text', - label : editor.lang.link.langCode, + label : linkLang.langCode, id : 'advLangCode', width : '110px', 'default' : '', @@ -1022,7 +1074,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'text', - label : editor.lang.link.tabIndex, + label : linkLang.tabIndex, id : 'advTabIndex', width : '80px', maxLength : 5, @@ -1046,7 +1098,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) [ { type : 'text', - label : editor.lang.link.advisoryTitle, + label : linkLang.advisoryTitle, 'default' : '', id : 'advTitle', setup : setupAdvParams, @@ -1055,7 +1107,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'text', - label : editor.lang.link.advisoryContentType, + label : linkLang.advisoryContentType, 'default' : '', id : 'advContentType', setup : setupAdvParams, @@ -1071,7 +1123,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) [ { type : 'text', - label : editor.lang.link.cssClasses, + label : linkLang.cssClasses, 'default' : '', id : 'advCSSClasses', setup : setupAdvParams, @@ -1080,7 +1132,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'text', - label : editor.lang.link.charset, + label : linkLang.charset, 'default' : '', id : 'advCharset', setup : setupAdvParams, @@ -1091,16 +1143,24 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'hbox', + widths : [ '45%', '55%' ], children : [ { type : 'text', - label : editor.lang.link.styles, + label : linkLang.rel, + 'default' : '', + id : 'advRel', + setup : setupAdvParams, + commit : commitAdvParams + }, + { + type : 'text', + label : linkLang.styles, 'default' : '', id : 'advStyles', setup : setupAdvParams, commit : commitAdvParams - } ] } @@ -1111,42 +1171,23 @@ CKEDITOR.dialog.add( 'link', function( editor ) ], onShow : function() { - this.fakeObj = false; - var editor = this.getParentEditor(), selection = editor.getSelection(), - ranges = selection.getRanges(), - element = null, - me = this; - // Fill in all the relevant fields if there's already one link selected. - if ( ranges.length == 1 ) - { + element = null; - var rangeRoot = ranges[0].getCommonAncestor( true ); - element = rangeRoot.getAscendant( 'a', true ); - if ( element && element.getAttribute( 'href' ) ) - { - selection.selectElement( element ); - } - else if ( ( element = rangeRoot.getAscendant( 'img', true ) ) && - element.getAttribute( '_cke_real_element_type' ) && - element.getAttribute( '_cke_real_element_type' ) == 'anchor' ) - { - this.fakeObj = element; - element = editor.restoreRealElement( this.fakeObj ); - selection.selectElement( this.fakeObj ); - } - else - element = null; - } + // Fill in all the relevant fields if there's already one link selected. + if ( ( element = plugin.getSelectedLink( editor ) ) && element.hasAttribute( 'href' ) ) + selection.selectElement( element ); + else + element = null; this.setupContent( parseLink.apply( this, [ editor, element ] ) ); }, onOk : function() { - var attributes = { href : 'javascript:void(0)/*' + CKEDITOR.tools.getNextNumber() + '*/' }, + var attributes = {}, removeAttributes = [], - data = { href : attributes.href }, + data = {}, me = this, editor = this.getParentEditor(); @@ -1157,13 +1198,13 @@ 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; + url = ( data.url && CKEDITOR.tools.trim( data.url.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': @@ -1210,7 +1251,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) } } - attributes._cke_saved_href = linkHref.join( '' ); + attributes[ 'data-cke-saved-href' ] = linkHref.join( '' ); break; } @@ -1238,7 +1279,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 { @@ -1247,7 +1291,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) else removeAttributes.push( 'target' ); - removeAttributes.push( '_cke_pa_onclick', 'onclick' ); + removeAttributes.push( 'data-cke-pa-onclick', 'onclick' ); } } @@ -1263,11 +1307,15 @@ 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' ]; + else + removeAttributes = removeAttributes.concat( [ 'data-cke-saved-name', 'name' ] ); + advAttr( 'advLangCode', 'lang' ); advAttr( 'advTabIndex', 'tabindex' ); advAttr( 'advTitle', 'title' ); @@ -1275,16 +1323,23 @@ CKEDITOR.dialog.add( 'link', function( editor ) advAttr( 'advCSSClasses', 'class' ); advAttr( 'advCharset', 'charset' ); advAttr( 'advStyles', 'style' ); + advAttr( 'advRel', 'rel' ); } + + // 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 ); @@ -1294,54 +1349,27 @@ 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; - - // IE BUG: Setting the name attribute to an existing link doesn't work. - // Must re-create the link from weired syntax to workaround. - if ( CKEDITOR.env.ie && attributes.name != element.getAttribute( 'name' ) ) - { - var newElement = new CKEDITOR.dom.element( '', - editor.document ); - - selection = editor.getSelection(); - - element.moveChildren( newElement ); - element.copyAttributes( newElement, { name : 1 } ); - newElement.replace( element ); - element = newElement; - - selection.selectElement( element ); - } + var element = this._.selectedElement, + href = element.data( 'cke-saved-href' ), + textView = element.getHtml(); element.setAttributes( attributes ); element.removeAttributes( removeAttributes ); - // Make the element display as an anchor if a name has been set. - if ( element.getAttribute( 'name' ) ) - element.addClass( 'cke_anchor' ); - else - element.removeClass( 'cke_anchor' ); + if ( data.adv && data.adv.advName && CKEDITOR.plugins.link.synAnchorSelector ) + element.addClass( element.getChildCount() ? 'cke_anchor' : 'cke_anchor_empty' ); - if ( this.fakeObj ) - editor.createFakeElement( element, 'cke_anchor', 'anchor' ).replace( this.fakeObj ); + // 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' ] ); + } delete this._.selectedElement; } @@ -1354,26 +1382,43 @@ CKEDITOR.dialog.add( 'link', function( editor ) if ( !editor.config.linkShowTargetTab ) this.hidePage( 'target' ); //Hide Target tab. + }, + // Inital focus on 'url' field if link is of type URL. + onFocus : function() + { + var linkType = this.getContentElement( 'info', 'linkType' ), + urlField; + if ( linkType && linkType.getValue() == 'url' ) + { + urlField = this.getContentElement( 'info', 'url' ); + urlField.select(); + } } }; }); /** - * The e-mail address anti-spam protection option. + * The e-mail address anti-spam protection option. The protection will be + * applied when creating or modifying e-mail links through the editor interface.
+ * Two methods of protection can be choosed: + *
  1. The e-mail parts (name, domain and any other query string) are + * assembled into a function call pattern. Such function must be + * provided by the developer in the pages that will use the contents. + *
  2. Only the e-mail address is obfuscated into a special string that + * has no meaning for humans or spam bots, but which is properly + * rendered and accepted by the browser.
+ * Both approaches require JavaScript to be enabled. * @name CKEDITOR.config.emailProtection - * @type {String} - * Two forms of protection could be choosed from : - * 1. The whole address parts ( name, domain with any other query string ) are assembled into a - * function call pattern which invoke you own provided function, with the specified arguments. - * 2. Only the e-mail address is obfuscated into unicode code point sequences, replacement are - * done by a String.fromCharCode() call. - * Note: Both approaches require JavaScript to be enabled. - * @default '' + * @since 3.1 + * @type String + * @default '' (empty string = disabled) + * @example + * // href="mailto:tester@ckeditor.com?subject=subject&body=body" + * config.emailProtection = ''; + * @example + * // href="e-mail" + * config.emailProtection = 'encode'; * @example - * config.emailProtection = ''; - * // href="mailto:tester@ckeditor.com?subject=subject&body=body" - * config.emailProtection = 'encode'; - * // href="e-mail" - * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)'; - * // href="javascript:mt('tester','ckeditor.com','subject','body')" + * // href="javascript:mt('tester','ckeditor.com','subject','body')" + * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)'; */