Merge branch 't/10195' into major

ckeditor · Mar 13, 2013 · cb6f552 · cb6f552
2 parents 8690613 + 02f1401
commit cb6f552
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/plugins/image/dialogs/image.js b/plugins/image/dialogs/image.js
@@ -981,6 +981,7 @@
 						{
 						id: 'cmbTarget',
 						type: 'select',
+						requiredContent: 'a[target]',
 						label: editor.lang.common.target,
 						'default': '',
 						items: [

diff --git a/plugins/image/plugin.js b/plugins/image/plugin.js
@@ -24,8 +24,6 @@
 
 			if ( CKEDITOR.dialog.isTabEnabled( editor, pluginName, 'advanced' ) )
 				allowed = 'img[alt,dir,id,lang,longdesc,!src,title]{*}(*)';
-			if ( CKEDITOR.dialog.isTabEnabled( editor, pluginName, 'link' ) )
-				allowed += ';a[!href]';
 
 			// Register the command.
 			editor.addCommand( pluginName, new CKEDITOR.dialogCommand( pluginName, {