Merge branch 't/13186' into major

Author: Reinmar

CHANGES.md

@@ -18,6 +18,7 @@ Fixed Issues:
 * [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the image dialog seems to be never used.
 * [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are 10px more to the right.
 * [#13280](http://dev.ckeditor.com/ticket/13280): [IE8] Fixed: Undo after inline widget drag&drop throws an error.
+* [#13186](http://dev.ckeditor.com/ticket/13186): Fixed: Content dropped to a nested editable is not filtered by the Advanced Content Filter.
 * Toolbar configurators:
   * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
   * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.

plugins/widget/plugin.js

@@ -2706,7 +2706,28 @@
 
 		// Handle pasted single widget.
 		editor.on( 'paste', function( evt ) {
-			evt.data.dataValue = evt.data.dataValue.replace( pasteReplaceRegex, pasteReplaceFn );
+			var data = evt.data;
+
+			data.dataValue = data.dataValue.replace( pasteReplaceRegex, pasteReplaceFn );
+
+			// If drag'n'drop kind of paste into nested editable (data.range), selection is set AFTER
+			// data is pasted, which means editor has no chance to change activeFilter's context.
+			// As a result, pasted data is filtered with default editor's filter instead of NE's and
+			// funny things get inserted. Changing the filter by analysis of the paste range below (#13186).
+			if ( data.range ) {
+				// Check if pasting into nested editable.
+				var nestedEditable = Widget.getNestedEditable( editor.editable(), data.range.startContainer );
+
+				if ( nestedEditable ) {
+					// Retrieve the filter from NE's data and set it active before editor.insertHtml is done
+					// in clipboard plugin.
+					var filter = CKEDITOR.filter.instances[ nestedEditable.data( 'cke-filter' ) ];
+
+					if ( filter ) {
+						editor.setActiveFilter( filter );
+					}
+				}
+			}
 		} );
 
 		// Listen with high priority to check widgets after data was inserted.

tests/plugins/widget/nestededitables.js

@@ -9,6 +9,10 @@
 	bender.editor = {
 		config: {
 			allowedContent: true,
+
+			// (#13186)
+			pasteFilter: null,
+
 			on: {
 				instanceReady: function( evt ) {
 					evt.editor.dataProcessor.writer.sortAttributes = 1;
@@ -1151,6 +1155,47 @@
 			} );
 		},
 
+		// (#13186)
+		'test pasting into widget nested editable when range in paste data (drop)': function() {
+			var editor = this.editor,
+				bot = this.editorBot;
+
+			editor.widgets.add( 'widget1', {
+				editables: {
+					nested: {
+						selector: '#widget1-nested',
+						allowedContent: 'i(a,c){color}'
+					}
+				}
+			} );
+
+			bot.setData( '<p>foo</p><div id="w1" data-widget="widget1"><p id="widget1-nested">xx</p></div>', function() {
+				var widget = getWidgetById( editor, 'w1' ),
+					nested = widget.editables.nested,
+					range = editor.createRange();
+
+				range.setStart( nested.getFirst(), 1 );
+				range.collapse( 1 );
+
+				editor.once( 'afterPaste', function() {
+					resume( function() {
+						assert.isInnerHtmlMatching( 'xy<i class="a c" style="color:green">z</i>yx@', nested.getHtml(), {
+							fixStyles: true
+						}, 'Nested editable filter in use.' );
+					} );
+				} );
+
+				editor.fire( 'paste', {
+					type: 'auto',
+					dataValue: 'y<i class="a b c d" style="margin-left:20px; color:green">z</i>y',
+					method: 'drop',
+					range: range
+				} );
+
+				wait();
+			} );
+		},
+
 		// Behaviour has been changed in 4.5 (#12112), so we're leaving this
 		// test as a validation of this change.
 		'test widgets\' commands are enabled in nested editable': function() {