浏览代码

Fix borders styles extracting.

Maciej Gołaszewski 6 年之前
父节点
当前提交
9627bc92c3

+ 2 - 12
packages/ckeditor5-engine/src/view/styles.js

@@ -117,7 +117,7 @@ export class StylesConverter {
 			styles
 		};
 
-		this.fire( 'extract:' + name, data );
+		this.fire( `extract:${ name }`, data );
 
 		if ( data.path ) {
 			return get( styles, data.path );
@@ -127,16 +127,6 @@ export class StylesConverter {
 			return data.value;
 		}
 
-		// if ( this.extractors.has( name ) ) {
-		// 	const extractor = this.extractors.get( name );
-		//
-		// 	if ( typeof extractor === 'string' ) {
-		// 		return this.getNormalized( extractor, styles );
-		// 	}
-		//
-		// 	return extractor( styles, this );
-		// }
-
 		return get( styles, toPath( name ) );
 	}
 
@@ -226,7 +216,7 @@ export default class Styles {
 	 *
 	 * Supports shorthands.
 	 *
-	 * @param {String} name
+	 * @param {String} propertyName
 	 * @returns {Boolean}
 	 */
 	hasProperty( propertyName ) {

+ 3 - 1
packages/ckeditor5-engine/src/view/styles/borderstyles.js

@@ -131,7 +131,9 @@ function getBorderPropertyPositionNormalizer( property, side ) {
 
 function getBorderPositionExtractor( which ) {
 	return ( evt, data ) => {
-		data.value = extractBorderPosition( data.styles.border, which, data );
+		if ( data.styles.border ) {
+			data.value = extractBorderPosition( data.styles.border, which, data );
+		}
 	};
 }