Przeglądaj źródła

Unified usage of view.Writer in converters.

Szymon Kupś 7 lat temu
rodzic
commit
b6997d3880

+ 3 - 2
packages/ckeditor5-engine/src/conversion/downcast-converters.js

@@ -483,7 +483,7 @@ function _getCreatorForArrayConfig( config ) {
  * The converter automatically consumes corresponding value from consumables list, stops the event (see
  * {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher}) and bind model and view elements.
  *
- *		modelDispatcher.on(
+ *		downcastDispatcher.on(
  *			'insert:myElem',
  *			insertElement( ( modelItem, consumable, conversionApi ) => {
  *				const writer = conversionApi.writer;
@@ -961,10 +961,11 @@ export function removeHighlight( highlightDescriptor ) {
 		// Then, iterate through all other items. Look for text nodes and unwrap them. Start from the end
 		// to prevent errors when view structure changes when unwrapping (and, for example, some attributes are merged).
 		const viewHighlightElement = createViewElementFromHighlightDescriptor( descriptor );
+		const viewWriter = conversionApi.writer;
 
 		for ( const item of Array.from( items ).reverse() ) {
 			if ( item.is( 'textProxy' ) ) {
-				conversionApi.writer.unwrap( ViewRange.createOn( item ), viewHighlightElement );
+				viewWriter.unwrap( ViewRange.createOn( item ), viewHighlightElement );
 			}
 		}
 	};

+ 6 - 6
packages/ckeditor5-engine/src/conversion/downcast-selection-converters.js

@@ -77,12 +77,12 @@ export function convertCollapsedSelection() {
 			return;
 		}
 
-		const writer = conversionApi.writer;
+		const viewWriter = conversionApi.writer;
 		const modelPosition = selection.getFirstPosition();
 		const viewPosition = conversionApi.mapper.toViewPosition( modelPosition );
-		const brokenPosition = writer.breakAttributes( viewPosition );
+		const brokenPosition = viewWriter.breakAttributes( viewPosition );
 
-		writer.setSelection( brokenPosition );
+		viewWriter.setSelection( brokenPosition );
 	};
 }
 
@@ -112,8 +112,8 @@ export function convertCollapsedSelection() {
  */
 export function clearAttributes() {
 	return ( evt, data, consumable, conversionApi ) => {
-		const writer = conversionApi.writer;
-		const viewSelection = writer.document.selection;
+		const viewWriter = conversionApi.writer;
+		const viewSelection = viewWriter.document.selection;
 
 		for ( const range of viewSelection.getRanges() ) {
 			// Not collapsed selection should not have artifacts.
@@ -124,7 +124,7 @@ export function clearAttributes() {
 				}
 			}
 		}
-		writer.setSelection( null );
+		viewWriter.setSelection( null );
 	};
 }