Ver código fonte

Renamed model to data.

Piotr Jasiun 9 anos atrás
pai
commit
424b48027b

+ 35 - 35
packages/ckeditor5-engine/src/treecontroller/model-to-view-converters.js

@@ -9,15 +9,15 @@ import ViewText from '../treeview/text.js';
 import ModelTreeWalker from './treemodel/treewalker.js';
 
 export function insert( nodeCreator ) {
-	return ( evt, model, context ) => {
-		model.consumable.consume( model.item, 'insert' );
+	return ( evt, data, context ) => {
+		data.consumable.consume( data.item, 'insert' );
 
-		const viewPosition = context.mapper.toViewPosition( model.range.start );
+		const viewPosition = context.mapper.toViewPosition( data.range.start );
 
 		// TODO: copy element
-		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( model, context );
+		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( data, context );
 
-		context.mapper.bind( model.item, viewNode );
+		context.mapper.bind( data.item, viewNode );
 
 		context.writer.insert( viewPosition, viewNode );
 
@@ -26,11 +26,11 @@ export function insert( nodeCreator ) {
 }
 
 export function insertText() {
-	return ( evt, model, context ) => {
-		model.consumable.consume( model.item, 'insert' );
+	return ( evt, data, context ) => {
+		data.consumable.consume( data.item, 'insert' );
 
-		const viewPosition = context.mapper.toViewPosition( model.position );
-		const viewNode = new ViewText( model.item.data );
+		const viewPosition = context.mapper.toViewPosition( data.position );
+		const viewNode = new ViewText( data.item.data );
 
 		context.writer.insert( viewPosition, viewNode );
 
@@ -39,22 +39,22 @@ export function insertText() {
 }
 
 export function setAttribute( attributesCreator ) {
-	return ( evt, model, context ) => {
+	return ( evt, data, context ) => {
 		let attributes;
 
 		if ( !attributesCreator ) {
-			attributes = model.item.getAttribute( model.attributeKey );
+			attributes = data.item.getAttribute( data.attributeKey );
 		} else {
-			attributes = attributesCreator( model );
+			attributes = attributesCreator( data );
 		}
 
 		if ( attributes ) {
-			model.consumable.consume( model.item, eventNameToConsumableType( evt.name ) );
+			data.consumable.consume( data.item, eventNameToConsumableType( evt.name ) );
 
-			const viewElement = context.mapper.toViewElement( model.item );
+			const viewElement = context.mapper.toViewElement( data.item );
 
 			if ( typeof attributes === 'string' || typeof attributes === 'number' ) {
-				viewElement.setAttribute( model.attributeKey, attributes );
+				viewElement.setAttribute( data.attributeKey, attributes );
 			} else {
 				for ( let attributeKey in attributes ) {
 					viewElement.setAttribute( attributeKey, attributes[ attributeKey ] );
@@ -67,19 +67,19 @@ export function setAttribute( attributesCreator ) {
 }
 
 export function removeAttribute( attributesCreator ) {
-	return ( evt, model, context ) => {
+	return ( evt, data, context ) => {
 		let attributeKeys;
 
 		if ( !attributesCreator ) {
-			attributeKeys = model.attributeKey;
+			attributeKeys = data.attributeKey;
 		} else {
-			attributeKeys = attributesCreator( model );
+			attributeKeys = attributesCreator( data );
 		}
 
 		if ( attributeKeys ) {
-			model.consumable.consume( model.item, eventNameToConsumableType( evt.name ) );
+			data.consumable.consume( data.item, eventNameToConsumableType( evt.name ) );
 
-			const viewElement = context.mapper.toViewElement( model.item );
+			const viewElement = context.mapper.toViewElement( data.item );
 
 			if ( typeof attributeKeys === 'string' ) {
 				viewElement.removeAttribute( attributeKeys );
@@ -95,12 +95,12 @@ export function removeAttribute( attributesCreator ) {
 }
 
 export function wrap( nodeCreator ) { // TODO: priority
-	return ( evt, model, context ) => {
-		model.consumable.consume( model.item, eventNameToConsumableType( evt.name ) );
+	return ( evt, data, context ) => {
+		data.consumable.consume( data.item, eventNameToConsumableType( evt.name ) );
 
-		const viewRange = context.mapper.toViewRange( model.range );
+		const viewRange = context.mapper.toViewRange( data.range );
 
-		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( model );
+		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( data );
 
 		context.writer.wrap( viewRange, viewNode );
 
@@ -109,12 +109,12 @@ export function wrap( nodeCreator ) { // TODO: priority
 }
 
 export function unwrap( nodeCreator ) {
-	return ( evt, model, context ) => {
-		model.consumable.consume( model.item, eventNameToConsumableType( evt.name ) );
+	return ( evt, data, context ) => {
+		data.consumable.consume( data.item, eventNameToConsumableType( evt.name ) );
 
-		const viewRange = context.mapper.toViewRange( model.range );
+		const viewRange = context.mapper.toViewRange( data.range );
 
-		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( model );
+		const viewNode = ( nodeCreator instanceof viewNode ) ? nodeCreator : nodeCreator( data );
 
 		context.writer.unwrap( viewRange, viewNode );
 
@@ -123,8 +123,8 @@ export function unwrap( nodeCreator ) {
 }
 
 export function move() {
-	return ( evt, model, context ) => {
-		const walker = new ModelTreeWalker( { boundaries: model.range, shallow: true } );
+	return ( evt, data, context ) => {
+		const walker = new ModelTreeWalker( { boundaries: data.range, shallow: true } );
 
 		let length = 0;
 
@@ -132,18 +132,18 @@ export function move() {
 			length += value.length;
 		}
 
-		const sourceModelRange = Range.createFromPositionAndShift( model.sourcePosition, length );
+		const sourceModelRange = Range.createFromPositionAndShift( data.sourcePosition, length );
 
 		const sourceViewRange = context.mapper.toViewRange( sourceModelRange );
-		const targetViewPosition = context.mapper.toViewRange( model.range.start );
+		const targetViewPosition = context.mapper.toViewRange( data.range.start );
 
 		context.writer.move( sourceViewRange, targetViewPosition );
 	};
 }
 
 export function remove() {
-	return ( evt, model, context ) => {
-		const walker = new ModelTreeWalker( { boundaries: model.range, shallow: true } );
+	return ( evt, data, context ) => {
+		const walker = new ModelTreeWalker( { boundaries: data.range, shallow: true } );
 
 		let length = 0;
 
@@ -151,7 +151,7 @@ export function remove() {
 			length += value.length;
 		}
 
-		const sourceModelRange = Range.createFromPositionAndShift( model.sourcePosition, length );
+		const sourceModelRange = Range.createFromPositionAndShift( data.sourcePosition, length );
 		const sourceViewRange = context.mapper.toViewRange( sourceModelRange );
 
 		context.writer.remove( sourceViewRange );

+ 16 - 16
packages/ckeditor5-engine/src/treecontroller/modelconversiondispatcher.js

@@ -33,14 +33,14 @@ export default class ModelConversionDispatcher {
 		for ( let value of range ) {
 			const item = value.item;
 			const range = Range.createFromPositionAndShift( value.previousPosition, value.length );
-			const model = { item, range };
+			const data = { item, range };
 
-			this._testAndFire( 'insert', model, this.controller );
+			this._testAndFire( 'insert', data, this.controller );
 
 			for ( let key of item.getAttributes() ) {
-				model.attributeKey = key;
+				data.attributeKey = key;
 
-				this._testAndFire( 'addAttribute:' + key, model, this.controller );
+				this._testAndFire( 'addAttribute:' + key, data, this.controller );
 			}
 		}
 
@@ -48,21 +48,21 @@ export default class ModelConversionDispatcher {
 	}
 
 	convertMove( range, sourcePosition ) {
-		const model = {
+		const data = {
 			range: range,
 			sourcePosition: sourcePosition,
 		};
 
-		this.fire( 'move', model, this.controller );
+		this.fire( 'move', data, this.controller );
 	}
 
 	convertRemove( range, sourcePosition ) {
-		const model = {
+		const data = {
 			range: range,
 			sourcePosition: sourcePosition,
 		};
 
-		this.fire( 'remove', model, this.controller );
+		this.fire( 'remove', data, this.controller );
 	}
 
 	convertAttribute( type, range, key, oldValue, newValue ) {
@@ -71,7 +71,7 @@ export default class ModelConversionDispatcher {
 		for ( let value of range ) {
 			const item = value.item;
 			const range = Range.createFromPositionAndShift( value.previousPosition, value.length );
-			const model = {
+			const data = {
 				item: item,
 				range: range,
 				attributeKey: key,
@@ -79,7 +79,7 @@ export default class ModelConversionDispatcher {
 				attributeNewValue: newValue
 			};
 
-			this._testAndFire( type + ':' + key, model, this.controller );
+			this._testAndFire( type + ':' + key, data, this.controller );
 		}
 
 		this.controller.consumable = undefined;
@@ -113,23 +113,23 @@ export default class ModelConversionDispatcher {
 		return consumable;
 	}
 
-	_testAndFire( type, model, controller ) {
-		if ( !model.consumable.test( model.item, type ) ) {
+	_testAndFire( type, data, controller ) {
+		if ( !data.consumable.test( data.item, type ) ) {
 			// Do not fire event if the item was consumed.
 			return;
 		}
 
 		if ( type === 'insert' ) {
-			if ( model.item instanceof TextFragment ) {
+			if ( data.item instanceof TextFragment ) {
 				// e.g. insert:text
-				this.fire( type + ':text', model, controller );
+				this.fire( type + ':text', data, controller );
 			} else {
 				// e.g. insert:element:p
-				this.fire( type + ':element:' + model.item.name, model, controller );
+				this.fire( type + ':element:' + data.item.name, data, controller );
 			}
 		} else {
 			// e.g. addAttribute:alt:img
-			this.fire( type + ':' + model.item.name, model, controller );
+			this.fire( type + ':' + data.item.name, data, controller );
 		}
 	}
 }