X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fplugin.js;h=f0278ec20f0067237e58388dc9dba6b210ff1ef5;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=26a8cb3be2ce39f9bd1c9b6e9242b785c87f3f41;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git

diff --git a/_source/plugins/link/plugin.js b/_source/plugins/link/plugin.js
index 26a8cb3..f0278ec 100644
--- a/_source/plugins/link/plugin.js
+++ b/_source/plugins/link/plugin.js
@@ -37,8 +37,8 @@ CKEDITOR.plugins.add( 'link',
 				'background-position: center center;' +
 				'background-repeat: no-repeat;' +
 				'border: 1px solid #a9a9a9;' +
-				'width: 18px;' +
-				'height: 18px;' +
+				'width: 18px !important;' +
+				'height: 18px !important;' +
 			'}\n' +
 			'a.cke_anchor' +
 			'{' +
@@ -58,13 +58,26 @@ CKEDITOR.plugins.add( 'link',
 				 * for this in Firefox. So we must detect the state by element paths.
 				 */
 				var command = editor.getCommand( 'unlink' ),
-					element = evt.data.path.lastElement.getAscendant( 'a', true );
+					element = evt.data.path.lastElement && evt.data.path.lastElement.getAscendant( 'a', true );
 				if ( element && element.getName() == 'a' && element.getAttribute( 'href' ) )
 					command.setState( CKEDITOR.TRISTATE_OFF );
 				else
 					command.setState( CKEDITOR.TRISTATE_DISABLED );
 			} );
 
+		editor.on( 'doubleclick', function( evt )
+			{
+				var element = CKEDITOR.plugins.link.getSelectedLink( editor ) || evt.data.element;
+
+				if ( !element.isReadOnly() )
+				{
+					if ( element.is( 'a' ) )
+						evt.data.dialog =  ( element.getAttribute( 'name' ) && !element.getAttribute( 'href' ) ) ? 'anchor' : 'link';
+					else if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+						evt.data.dialog = 'anchor';
+				}
+			});
+
 		// If the "menu" plugin is loaded, register the menu items.
 		if ( editor.addMenuItems )
 		{
@@ -100,7 +113,7 @@ CKEDITOR.plugins.add( 'link',
 		{
 			editor.contextMenu.addListener( function( element, selection )
 				{
-					if ( !element )
+					if ( !element || element.isReadOnly() )
 						return null;
 
 					var isAnchor = ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' );
@@ -166,13 +179,22 @@ CKEDITOR.plugins.link =
 	 */
 	getSelectedLink : function( editor )
 	{
-		var range;
-		try { range  = editor.getSelection().getRanges()[ 0 ]; }
+		try
+		{
+			var selection = editor.getSelection();
+			if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
+			{
+				var selectedElement = selection.getSelectedElement();
+				if ( selectedElement.is( 'a' ) )
+					return selectedElement;
+			}
+
+			var range = selection.getRanges( true )[ 0 ];
+			range.shrink( CKEDITOR.SHRINK_TEXT );
+			var root = range.getCommonAncestor();
+			return root.getAscendant( 'a', true );
+		}
 		catch( e ) { return null; }
-
-		range.shrink( CKEDITOR.SHRINK_TEXT );
-		var root = range.getCommonAncestor();
-		return root.getAscendant( 'a', true );
 	}
 };