Content should be filtered even if config.pasteFilter was not defined…

… (because editor.pasteFilter can be created on the fly).

plugins/clipboard/plugin.js

@@ -126,7 +126,7 @@
 			}
 			// On Webkit the pasteFilter defaults 'semantic-content' because pasted data is so terrible
 			// that it must be filtered.
-			else if ( CKEDITOR.env.webkit ) {
+			else if ( CKEDITOR.env.webkit && !( 'pasteFilter' in editor.config ) ) {
 				filterType = 'semantic-content';
 			}
 
@@ -270,10 +270,9 @@
 				// Strip presentional markup & unify text markup.
 				// Forced plain text (dialog or forcePAPT).
 				if ( type == 'text' && trueType == 'html' ) {
-					// Init filter only if needed and cache it.
-					data = filterContent( editor, data, true );
-				} else if ( !internal && editor.config.pasteFilter ) {
-					data = filterContent( editor, data );
+					data = filterContent( editor, data, filtersFactory.get( 'plain-text' ) );
+				} else if ( !internal && editor.pasteFilter ) {
+					data = filterContent( editor, data, editor.pasteFilter );
 				}
 
 				if ( dataObj.startsWithEOL ) {
@@ -1216,14 +1215,7 @@
 		};
 	}() );
 
-	function filterContent( editor, data, forcedText ) {
-		var filter = ( forcedText ? filtersFactory.get( 'plain-text' ) : editor.pasteFilter );
-
-		// If config.pasteFilter and config.forcePAPT are not defined, then there's no filter.
-		if ( !filter ) {
-			return data;
-		}
-
+	function filterContent( editor, data, filter ) {
 		var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data ),
 			writer = new CKEDITOR.htmlParser.basicWriter();
 

tests/plugins/clipboard/drop.js

@@ -145,29 +145,37 @@ bender.editors = {
 		name: 'framed',
 		creator: 'replace',
 		config: {
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	},
 	inline: {
 		name: 'inline',
 		creator: 'inline',
 		config: {
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	},
 	divarea: {
 		name: 'divarea',
 		creator: 'replace',
 		config: {
 			extraPlugins: 'divarea',
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	},
 	cross: {
 		name: 'cross',
 		creator: 'replace',
 		config: {
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	}
 };

tests/plugins/clipboard/paste.js

@@ -15,11 +15,16 @@
 	bender.editor = {
 		config: {
 			clipboard_defaultContentType: 'text',
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	};
 
 	function testEditor( tc, config, callback ) {
+		// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+		config.pasteFilter = null;
+
 		var editor = new CKEDITOR.editor( config );
 
 		editor.on( 'loaded', function() {

tests/plugins/clipboard/pastefilter.js

@@ -71,6 +71,14 @@
 				pasteFilter: 'h2',
 				allowedContent: true
 			}
+		},
+
+		editorDisabledFilter: {
+			name: 'editorDisabledFilter',
+			config: {
+				allowedContent: true,
+				pasteFilter: null
+			}
 		}
 	};
 
@@ -112,6 +120,15 @@
 		}
 	};
 
+	tests[ 'editor pasteFilter set to null' ] = function() {
+		var editor = this.editors.editorDisabledFilter;
+
+		assert.isNull( editor.pasteFilter );
+
+		assertPasteEvent( editor, { dataValue: '<h2 style="color: red">Foo</h2>' },
+			{ dataValue: '<h2 style="color: red">Foo</h2>' } );
+	};
+
 	tests[ 'editor has pasteFilter defined if forcePasteAsPlainText is set to true' ] = function() {
 		var editor = this.editors.editorForcePAPT,
 			pasteFilter = editor.pasteFilter;
@@ -156,6 +173,23 @@
 			{ dataValue: '<p>Foo <strong>bar</strong></p>' }, 'new fitler' );
 	};
 
+	tests[ 'test content is filtered even if config.pasteFilter is undefined' ] = function() {
+		var editor = this.editors.editorNoConfiguration;
+
+		assert.isFalse( !!editor.config.pasteFilter, 'config was not set' );
+
+		editor.pasteFilter = new CKEDITOR.filter( 'p h2' );
+
+		try {
+			assertPasteEvent( editor, { dataValue: '<h2>Foo <strong>bar</strong></h2>' },
+				{ dataValue: '<h2>Foo bar</h2>' }, 'new fitler' );
+		} catch ( e ) {
+			throw e;
+		} finally {
+			delete editor.pasteFilter; // Tear down properly.
+		}
+	};
+
 	createTest(
 		'test plain', 'editorPlain', contents.listWithSpan,
 		'<p>hefkdjfkdjllo</p><p>moto</p>'

tests/plugins/pastefromword/keepstyles.js

@@ -8,7 +8,9 @@
 	bender.editor = {
 		config: {
 			pasteFromWordRemoveStyles: false,
-			pasteFromWordRemoveFontStyles: false
+			pasteFromWordRemoveFontStyles: false,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	};
 

tests/plugins/uploadimage/uploadimage.js

@@ -18,15 +18,19 @@
 			config: {
 				extraPlugins: 'uploadimage,image',
 				removePlugins: 'image2',
-				imageUploadUrl: 'http://foo/upload'
+				imageUploadUrl: 'http://foo/upload',
+				// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+				pasteFilter: null
 			}
 		},
 		inline: {
 			name: 'inline',
 			creator: 'inline',
 			config: {
 				extraPlugins: 'uploadimage,image2',
-				filebrowserImageUploadUrl: 'http://foo/upload?type=Images'
+				filebrowserImageUploadUrl: 'http://foo/upload?type=Images',
+				// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+				pasteFilter: null
 			}
 		}
 	};

tests/tickets/11237/1.js

@@ -7,7 +7,9 @@
 
 	bender.editor = {
 		config: {
-			allowedContent: true
+			allowedContent: true,
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
 		}
 	};
 

tests/tickets/9456/2.js

@@ -5,7 +5,12 @@
 ( function() {
 	'use strict';
 
-	bender.editor = true;
+	bender.editor = {
+		config: {
+			// Disable pasteFilter on Webkits (pasteFilter defaults semantic-text on Webkits).
+			pasteFilter: null
+		}
+	};
 
 	var compat = bender.tools.compatHtml,
 		engineName = CKEDITOR.env.webkit ? 'webkit' :