Merge branch 't/13886'

Author: mlewand

CHANGES.md

@@ -5,6 +5,7 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
 * [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
 
 ## CKEditor 4.5.8

core/filter.js

@@ -1248,22 +1248,20 @@
 			styles = styleDef.styles,
 			attrs = styleDef.attributes || {};
 
-		if ( styles ) {
+		if ( styles && !CKEDITOR.tools.isEmpty( styles ) ) {
 			styles = copy( styles );
 			attrs.style = CKEDITOR.tools.writeCssText( styles, true );
 		} else {
 			styles = {};
 		}
 
-		var el = {
+		return {
 			name: styleDef.element,
 			attributes: attrs,
 			classes: attrs[ 'class' ] ? attrs[ 'class' ].split( /\s+/ ) : [],
 			styles: styles,
 			children: []
 		};
-
-		return el;
 	}
 
 	// Mock hash based on string.
@@ -1873,6 +1871,7 @@
 	//
 	// TRANSFORMATIONS --------------------------------------------------------
 	//
+	var transformationsTools;
 
 	// Apply given transformations group to the element.
 	function applyTransformationsGroup( filter, element, group ) {
@@ -2021,7 +2020,7 @@
 	 * @class CKEDITOR.filter.transformationsTools
 	 * @singleton
 	 */
-	var transformationsTools = CKEDITOR.filter.transformationsTools = {
+	transformationsTools = CKEDITOR.filter.transformationsTools = {
 		/**
 		 * Converts `width` and `height` attributes to styles.
 		 *

tests/core/filter/check.js

@@ -75,6 +75,8 @@
 		'test element + styles - style': function() {
 			var test = createTest( 'a p{color,width,border-*}' );
 
+			// #13886
+			test( true, st( { element: 'a', styles: {} } ) );
 			test( true, st( { element: 'p', styles: { color: 'red' } } ) );
 			test( true, st( { element: 'a', styles: { color: 'red', width: '10px' } } ) );
 			test( true, st( { element: 'p', styles: { 'border-style': 'solid' } } ) );
@@ -364,4 +366,4 @@
 			test( false, [ 'x', 'y' ] );
 		}
 	} );
-} )();
+} )();

tests/core/filter/filter.js

@@ -860,6 +860,15 @@
 			filter( '<bar><foo>bar</foo></bar>',					'<bar>bar</bar>' );
 			// #12683
 			filter( '<bar><h1>bar</h1></bar>',						'<p>bar</p>' );
+		},
+
+		// #13886
+		'test filter styles validation with none or empty styles': function() {
+			var filter = new CKEDITOR.filter( 'a {color}' );
+
+			assert.isTrue( filter.check( new CKEDITOR.style( { element: 'a' } ) ) );
+			assert.isTrue( filter.check( new CKEDITOR.style( { element: 'a', styles: {} } ) ) );
+			assert.isTrue( filter.check( new CKEDITOR.style( { element: 'a', styles: { color: 'red' } } ) ) );
 		}
 	} );
-} )();
+} )();