X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fdialogs%2Flink.js;h=51f5623ce699bd20b8e4203659af46eff952fc9e;hp=a6596169d046d380e35028fedeefa790e7edfba1;hb=f0610347140239143439a511ee2bd48cb784f470;hpb=4e70ea24db840898be8cc21c950363a52a2a6aba

diff --git a/_source/plugins/link/dialogs/link.js b/_source/plugins/link/dialogs/link.js
index a659616..51f5623 100644
--- a/_source/plugins/link/dialogs/link.js
+++ b/_source/plugins/link/dialogs/link.js
@@ -244,14 +244,38 @@ CKEDITOR.dialog.add( 'link', function( editor )
 		}
 
 		// Find out whether we have any anchors in the editor.
-		var anchorList = new CKEDITOR.dom.nodeList( editor.document.$.anchors ),
-			anchors = retval.anchors = [],
+		var anchors = retval.anchors = [],
 			item;
 
-		for ( var i = 0, count = anchorList.count(); i < 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 )
 		{
-			item = anchorList.getItem( i );
-			anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) };
+			var links = editor.document.getElementsByTag( 'a' );
+			for ( i = 0, count = links.count(); i < count; i++ )
+			{
+				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' ) };
+			}
+		}
+
+		if ( CKEDITOR.plugins.link.fakeAnchor )
+		{
+			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.
@@ -1174,7 +1198,7 @@ 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 ) || '';
+						url = ( data.url && CKEDITOR.tools.trim( data.url.url ) ) || '';
 					attributes[ 'data-cke-saved-href' ] = ( url.indexOf( '/' ) === 0 ) ? url : protocol + url;
 					break;
 				case 'anchor':