Merge branch 't/14747'

CHANGES.md

@@ -3,6 +3,10 @@ CKEditor 4 Changelog
 
 ## CKEditor 4.5.11
 
+New Features:
+
+* [#14747](http://dev.ckeditor.com/ticket/14747): The enhanced image caption does not support the link target attribute.
+
 Fixed Issues:
 
 * [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images in Edge does not work.

plugins/image2/plugin.js

@@ -286,7 +286,7 @@
 			editables: {
 				caption: {
 					selector: 'figcaption',
-					allowedContent: 'br em strong sub sup u s; a[!href]'
+					allowedContent: 'br em strong sub sup u s; a[!href,target]'
 				}
 			},
 

tests/plugins/image2/acf.js

@@ -1,5 +1,5 @@
 /* bender-tags: editor,unit,widget */
-/* bender-ckeditor-plugins: image2,justify,toolbar */
+/* bender-ckeditor-plugins: image2,justify,toolbar,link */
 /* global widgetTestsTools, image2TestsTools */
 
 ( function() {
@@ -63,6 +63,17 @@
 					height: true,
 					hasCaption: true
 				}
+			},
+			link_target_allowed: {
+				name: 'link_target_allowed',
+				fields: {
+					src: true,
+					alt: true,
+					align: true,
+					width: true,
+					height: true,
+					hasCaption: true
+				}
 			}
 		};
 
@@ -247,6 +258,17 @@
 			);
 		},
 
+		'test allow caption link target': function() {
+			var bot = this.editorBots.link_target_allowed,
+				content = '<figure><img alt="" src="_assets/bar.png" /><figcaption>' +
+					'<a href="http://google.com" target="_blank">caption</a>' +
+					'</figcaption></figure>';
+
+			bot.setData( content, function() {
+				bender.assert.isInnerHtmlMatching( content, bot.getData() );
+			} );
+		},
+
 		'test justify plugin integration when (alignment disallowed)': function() {
 			var bot = this.editorBots.no_align;
 
@@ -265,4 +287,4 @@
 			} );
 		}
 	} );
-} )();
+} )();