Przeglądaj źródła

The fixListStyleAttributeOnListItemElements() should not re-create internal functions.

Maciej Gołaszewski 5 lat temu
rodzic
commit
df18a0ffe4
1 zmienionych plików z 48 dodań i 48 usunięć
  1. 48 48
      packages/ckeditor5-list/src/liststyleediting.js

+ 48 - 48
packages/ckeditor5-list/src/liststyleediting.js

@@ -522,68 +522,68 @@ function fixListStyleAttributeOnListItemElements( editor ) {
 
 		return wasFixed;
 	};
+}
 
-	// Checks whether the `listStyle` attribute should be copied from the `baseItem` element.
-	//
-	// The attribute should be copied if the inserted element does not have defined it and
-	// the value for the element is other than default in the base element.
-	//
-	// @param {module:engine/model/element~Element|null} baseItem
-	// @param {module:engine/model/element~Element} itemToChange
-	// @returns {Boolean}
-	function shouldInheritListType( baseItem, itemToChange ) {
-		if ( !baseItem ) {
-			return false;
-		}
+// Checks whether the `listStyle` attribute should be copied from the `baseItem` element.
+//
+// The attribute should be copied if the inserted element does not have defined it and
+// the value for the element is other than default in the base element.
+//
+// @param {module:engine/model/element~Element|null} baseItem
+// @param {module:engine/model/element~Element} itemToChange
+// @returns {Boolean}
+function shouldInheritListType( baseItem, itemToChange ) {
+	if ( !baseItem ) {
+		return false;
+	}
 
-		const baseListStyle = baseItem.getAttribute( 'listStyle' );
+	const baseListStyle = baseItem.getAttribute( 'listStyle' );
 
-		if ( !baseListStyle ) {
-			return false;
-		}
-
-		if ( baseListStyle === DEFAULT_LIST_TYPE ) {
-			return false;
-		}
+	if ( !baseListStyle ) {
+		return false;
+	}
 
-		if ( baseItem.getAttribute( 'listType' ) !== itemToChange.getAttribute( 'listType' ) ) {
-			return false;
-		}
+	if ( baseListStyle === DEFAULT_LIST_TYPE ) {
+		return false;
+	}
 
-		return true;
+	if ( baseItem.getAttribute( 'listType' ) !== itemToChange.getAttribute( 'listType' ) ) {
+		return false;
 	}
 
-	// Checks whether the `listStyle` attribute should be copied from previous list item.
-	//
-	// The attribute should be copied if there's a mismatch of styles of the pasted list into a nested list.
-	// Top-level lists are not normalized as we allow side-by-side list of different types.
-	//
-	// @param {module:engine/model/element~Element|null} previousItem
-	// @param {module:engine/model/element~Element} itemToChange
-	// @returns {Boolean}
-	function shouldInheritListTypeFromPreviousItem( previousItem, itemToChange ) {
-		if ( !previousItem || !previousItem.is( 'element', 'listItem' ) ) {
-			return false;
-		}
+	return true;
+}
 
-		if ( itemToChange.getAttribute( 'listType' ) !== previousItem.getAttribute( 'listType' ) ) {
-			return false;
-		}
+// Checks whether the `listStyle` attribute should be copied from previous list item.
+//
+// The attribute should be copied if there's a mismatch of styles of the pasted list into a nested list.
+// Top-level lists are not normalized as we allow side-by-side list of different types.
+//
+// @param {module:engine/model/element~Element|null} previousItem
+// @param {module:engine/model/element~Element} itemToChange
+// @returns {Boolean}
+function shouldInheritListTypeFromPreviousItem( previousItem, itemToChange ) {
+	if ( !previousItem || !previousItem.is( 'element', 'listItem' ) ) {
+		return false;
+	}
 
-		const previousItemIndent = previousItem.getAttribute( 'listIndent' );
+	if ( itemToChange.getAttribute( 'listType' ) !== previousItem.getAttribute( 'listType' ) ) {
+		return false;
+	}
 
-		if ( previousItemIndent < 1 || previousItemIndent !== itemToChange.getAttribute( 'listIndent' ) ) {
-			return false;
-		}
+	const previousItemIndent = previousItem.getAttribute( 'listIndent' );
 
-		const previousItemListStyle = previousItem.getAttribute( 'listStyle' );
+	if ( previousItemIndent < 1 || previousItemIndent !== itemToChange.getAttribute( 'listIndent' ) ) {
+		return false;
+	}
 
-		if ( !previousItemListStyle || previousItemListStyle === itemToChange.getAttribute( 'listStyle' ) ) {
-			return false;
-		}
+	const previousItemListStyle = previousItem.getAttribute( 'listStyle' );
 
-		return true;
+	if ( !previousItemListStyle || previousItemListStyle === itemToChange.getAttribute( 'listStyle' ) ) {
+		return false;
 	}
+
+	return true;
 }
 
 // Removes the `listStyle` attribute from "todo" list items.