X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=94ee042e9ba10b218a5f7ef0807f108c3e1bd856;hb=4e90e78dc97789709ee7404359a5517540c27553;hp=eac5500cc6f76bde63c959403b7c22a0576c5da2;hpb=039a051ccf3901311661022a30afd60fc38130c9;p=ckeditor.git diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js index eac5500..94ee042 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 ) { @@ -194,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]; @@ -223,7 +226,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' ); @@ -231,6 +238,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) advAttr( 'advCSSClasses', 'class' ); advAttr( 'advCharset', 'charset' ); advAttr( 'advStyles', 'style' ); + advAttr( 'advRel', 'rel' ); } // Find out whether we have any anchors in the editor. @@ -242,7 +250,7 @@ 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 ) ); } @@ -448,8 +456,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 ) @@ -758,7 +766,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) setup : function( data ) { if ( data.target ) - this.setValue( data.target.type ); + this.setValue( data.target.type || 'notSet' ); targetChanged.call( this ); }, commit : function( data ) @@ -791,7 +799,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'vbox', - width : 260, + width : '100%', align : 'center', padding : 2, id : 'popupFeatures', @@ -895,9 +903,9 @@ CKEDITOR.dialog.add( 'link', function( editor ) [ { type : 'text', - widths : [ '30%', '70%' ], + widths : [ '50%', '50%' ], labelLayout : 'horizontal', - label : linkLang.popupWidth, + label : commonLang.width, id : 'width', setup : setupPopupParams, commit : commitPopupParams @@ -906,7 +914,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'text', labelLayout : 'horizontal', - widths : [ '55%', '45%' ], + widths : [ '50%', '50%' ], label : linkLang.popupLeft, id : 'left', setup : setupPopupParams, @@ -922,8 +930,8 @@ CKEDITOR.dialog.add( 'link', function( editor ) { type : 'text', labelLayout : 'horizontal', - widths : [ '30%', '70%' ], - label : linkLang.popupHeight, + widths : [ '50%', '50%' ], + label : commonLang.height, id : 'height', setup : setupPopupParams, commit : commitPopupParams @@ -933,7 +941,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) type : 'text', labelLayout : 'horizontal', label : linkLang.popupTop, - widths : [ '55%', '45%' ], + widths : [ '50%', '50%' ], id : 'top', setup : setupPopupParams, commit : commitPopupParams @@ -1115,16 +1123,24 @@ CKEDITOR.dialog.add( 'link', function( editor ) }, { type : 'hbox', + widths : [ '45%', '55%' ], children : [ { type : 'text', + label : linkLang.rel, + 'default' : '', + id : 'advRel', + setup : setupAdvParams, + commit : commitAdvParams + }, + { + type : 'text', label : linkLang.styles, 'default' : '', id : 'advStyles', setup : setupAdvParams, commit : commitAdvParams - } ] } @@ -1145,8 +1161,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 ); @@ -1159,9 +1175,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(); @@ -1173,12 +1189,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': @@ -1225,7 +1241,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) } } - attributes._cke_saved_href = linkHref.join( '' ); + attributes[ 'data-cke-saved-href' ] = linkHref.join( '' ); break; } @@ -1253,7 +1269,7 @@ 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' ); @@ -1265,7 +1281,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) else removeAttributes.push( 'target' ); - removeAttributes.push( '_cke_pa_onclick', 'onclick' ); + removeAttributes.push( 'data-cke-pa-onclick', 'onclick' ); } } @@ -1281,11 +1297,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' ); @@ -1293,8 +1316,13 @@ 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. @@ -1304,7 +1332,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) { // Short mailto link text view (#5736). var text = new CKEDITOR.dom.text( data.type == 'email' ? - data.email.address : attributes._cke_saved_href, editor.document ); + data.email.address : attributes[ 'data-cke-saved-href' ], editor.document ); ranges[0].insertNode( text ); ranges[0].selectNodeContents( text ); selection.selectRanges( ranges ); @@ -1314,39 +1342,25 @@ 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. // Must re-create the link from weired syntax to workaround. - if ( CKEDITOR.env.ie && attributes.name != element.getAttribute( 'name' ) ) + if ( CKEDITOR.env.ie && !( CKEDITOR.document.$.documentMode >= 8 ) && attributes.name != element.getAttribute( 'name' ) ) { var newElement = new CKEDITOR.dom.element( '', editor.document ); selection = editor.getSelection(); - element.moveChildren( newElement ); element.copyAttributes( newElement, { name : 1 } ); + element.moveChildren( newElement ); newElement.replace( element ); element = newElement; @@ -1360,7 +1374,7 @@ CKEDITOR.dialog.add( 'link', function( editor ) { // Short mailto link text view (#5736). element.setHtml( data.type == 'email' ? - data.email.address : attributes._cke_saved_href ); + 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' ) )