Szymon Kupś 8 lat temu
rodzic
commit
8b7ddaada1

+ 1 - 1
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -225,7 +225,7 @@ export default class DataController {
 	 * {@link module:engine/view/documentfragment~DocumentFragment view document fragment} converted by the
 	 * {@link #viewToModel view to model converters}.
 	 *
-	 * When marker stamps were converted during conversion process then will be set as DocumentFragment's
+	 * When marker elements were converted during conversion process then will be set as DocumentFragment's
 	 * {@link module:engine/model/documentfragment~DocumentFragment#markers static markers map}.
 	 *
 	 * @param {module:engine/view/element~Element|module:engine/view/documentfragment~DocumentFragment} viewElementOrFragment

+ 1 - 1
packages/ckeditor5-engine/src/conversion/buildmodelconverter.js

@@ -36,7 +36,7 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
  * {@link module:engine/conversion/model-to-view-converters}, {@link module:engine/conversion/modelconsumable~ModelConsumable},
  * {@link module:engine/conversion/mapper~Mapper}.
  *
- * Using this API it is possible to create four kinds of converters:
+ * Using this API it is possible to create five kinds of converters:
  *
  * 1. Model element to view element converter. This is a converter that takes the model element and represents it
  * in the view.

+ 10 - 10
packages/ckeditor5-engine/src/conversion/viewconversiondispatcher.js

@@ -137,7 +137,7 @@ export default class ViewConversionDispatcher {
 	 * @param {Object} [additionalData] Additional data to be passed in `data` argument when firing `ViewConversionDispatcher`
 	 * events. See also {@link ~ViewConversionDispatcher#event:element element event}.
 	 * @returns {module:engine/model/documentfragment~DocumentFragment} Model data that is a result of the conversion process
-	 * wrapped in `DocumentFragment`. Converted marker stamps will be set as that document fragment's
+	 * wrapped in `DocumentFragment`. Converted marker elements will be set as that document fragment's
 	 * {@link module:engine/model/documentfragment~DocumentFragment#markers static markers map}.
 	 */
 	convert( viewItem, additionalData = {} ) {
@@ -157,7 +157,7 @@ export default class ViewConversionDispatcher {
 			conversionResult = new ModelDocumentFragment( [ conversionResult ] );
 		}
 
-		// Extract temporary markers stamp from model and set as static markers collection.
+		// Extract temporary markers elements from model and set as static markers collection.
 		conversionResult.markers = extractMarkersFromModelFragment( conversionResult );
 
 		return conversionResult;
@@ -279,7 +279,7 @@ mix( ViewConversionDispatcher, EmitterMixin );
 // @param {module:engine/view/documentfragment~DocumentFragment|module:engine/view/node~Node} modelItem Fragment of model.
 // @returns {Map<String, module:engine/model/range~Range>} List of static markers.
 function extractMarkersFromModelFragment( modelItem ) {
-	const markerStamps = new Set();
+	const markerElements = new Set();
 	const markers = new Map();
 
 	// Create ModelTreeWalker.
@@ -290,16 +290,16 @@ function extractMarkersFromModelFragment( modelItem ) {
 
 	// Walk through DocumentFragment and collect marker elements.
 	for ( const value of walker ) {
-		// Check if current element is a marker stamp.
+		// Check if current element is a marker.
 		if ( value.item.name == '$marker' ) {
-			markerStamps.add( value.item );
+			markerElements.add( value.item );
 		}
 	}
 
 	// Walk through collected marker elements store its path and remove its from the DocumentFragment.
-	for ( const stamp of markerStamps ) {
-		const markerName = stamp.getAttribute( 'data-name' );
-		const currentPosition = ModelPosition.createBefore( stamp );
+	for ( const markerElement of markerElements ) {
+		const markerName = markerElement.getAttribute( 'data-name' );
+		const currentPosition = ModelPosition.createBefore( markerElement );
 
 		// When marker of given name is not stored it means that we have found the beginning of the range.
 		if ( !markers.has( markerName ) ) {
@@ -309,8 +309,8 @@ function extractMarkersFromModelFragment( modelItem ) {
 			markers.get( markerName ).end = ModelPosition.createFromPosition( currentPosition );
 		}
 
-		// Remove marker stamp element from DocumentFragment.
-		remove( ModelRange.createOn( stamp ) );
+		// Remove marker element from DocumentFragment.
+		remove( ModelRange.createOn( markerElement ) );
 	}
 
 	return markers;

+ 1 - 1
packages/ckeditor5-engine/tests/conversion/viewconversiondispatcher.js

@@ -172,7 +172,7 @@ describe( 'ViewConversionDispatcher', () => {
 			expect( spy.calledOnce ).to.be.true;
 		} );
 
-		it( 'should extract temporary markers stamps from converter element and create static markers list', () => {
+		it( 'should extract temporary markers elements from converter element and create static markers list', () => {
 			const viewFragment = new ViewDocumentFragment();
 
 			dispatcher.on( 'documentFragment', ( evt, data ) => {