X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flink%2Fplugin.js;h=e5b7044ec8b8a0ee53913db1af9fe931507789d8;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=f373eaf339f2caef828b4fc03254b651c8b97970;hpb=f8fc585c18d287eb325c575596d183122486b641;p=ckeditor.git

diff --git a/_source/plugins/link/plugin.js b/_source/plugins/link/plugin.js
index f373eaf..e5b7044 100644
--- a/_source/plugins/link/plugin.js
+++ b/_source/plugins/link/plugin.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
 */
 
@@ -30,6 +30,7 @@ CKEDITOR.plugins.add( 'link',
 		CKEDITOR.dialog.add( 'anchor', this.path + 'dialogs/anchor.js' );
 
 		// Add the CSS styles for anchor placeholders.
+		var side = editor.lang.dir == 'rtl' ? 'right' : 'left';
 		editor.addCss(
 			'img.cke_anchor' +
 			'{' +
@@ -37,16 +38,16 @@ 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' +
 			'{' +
 				'background-image: url(' + CKEDITOR.getUrl( this.path + 'images/anchor.gif' ) + ');' +
-				'background-position: 0 center;' +
+				'background-position: ' + side + ' center;' +
 				'background-repeat: no-repeat;' +
 				'border: 1px solid #a9a9a9;' +
-				'padding-left: 18px;' +
+				'padding-' + side + ': 18px;' +
 			'}'
 		   	);
 
@@ -58,7 +59,7 @@ 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
@@ -69,10 +70,13 @@ CKEDITOR.plugins.add( 'link',
 			{
 				var element = CKEDITOR.plugins.link.getSelectedLink( editor ) || evt.data.element;
 
-				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 ( !element.isReadOnly() )
+				{
+					if ( element.is( 'a' ) )
+						evt.data.dialog =  ( element.getAttribute( 'name' ) && !element.getAttribute( 'href' ) ) ? 'anchor' : 'link';
+					else if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'anchor' )
+						evt.data.dialog = 'anchor';
+				}
 			});
 
 		// If the "menu" plugin is loaded, register the menu items.
@@ -110,10 +114,10 @@ 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' );
+					var isAnchor = ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'anchor' );
 
 					if ( !isAnchor )
 					{
@@ -176,13 +180,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 );
 	}
 };