8
0
Oskar Wróbel 9 лет назад
Родитель
Сommit
9515265b6e

+ 3 - 14
packages/ckeditor5-engine/src/controller/datacontroller.js

@@ -234,7 +234,7 @@ export default class DataController {
 	 * Element or document fragment which content will be converted.
 	 * @param {String} [context='$root'] Base context in which the view will be converted to the model. See:
 	 * {@link module:engine/conversion/viewconversiondispatcher~ViewConversionDispatcher#convert}.
-	 * @returns {module:engine/model/documentfragment~DocumentFragment} View item converted to Model DocumentFragment.
+	 * @returns {module:engine/model/documentfragment~DocumentFragment} Output document fragment.
 	 */
 	toModel( viewElementOrFragment, context = '$root' ) {
 		const { conversionResult, markers } = this.viewToModel.convert( viewElementOrFragment, { context: [ context ] } );
@@ -246,10 +246,8 @@ export default class DataController {
 			documentFragment = conversionResult;
 		}
 
-		// Set markers to the documentFragment.
-		for ( const marker of markers ) {
-			documentFragment.markers.set( marker[ 0 ], marker[ 1 ] );
-		}
+		// Set converted markers to the documentFragment.
+		documentFragment.markers = markers;
 
 		return documentFragment;
 	}
@@ -321,15 +319,6 @@ export default class DataController {
 
 mix( DataController, EmitterMixin );
 
-/**
- * Result of parsing view to model.
- *
- * @typedef {Object} {module:engine/controller/datacontroller~ParsedModelData}
- * @property {module:engine/model/documentfragment~DocumentFragment|module:engine/model/node~Node} modelItem
- * Fragment of parsed model.
- * @property {Map<String, module:engine/model/range~Range>} markers List of parsed marker stamps.
- */
-
 /**
  * Event fired when {@link #insertContent} method is called.
  * The {@link #insertContent default action of that method} is implemented as a

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

@@ -283,7 +283,7 @@ function extractMarkersFromModelFragment( modelItem ) {
 /**
  * Model data that is a result of the conversion process.
  *
- * @typedef {ConvertedModelData} engine/conversion/viewconversiondispatcher~ConvertedModelData
+ * @typedef {ConvertedModelData} module:engine/conversion/viewconversiondispatcher~ConvertedModelData
  * @property {module:engine/model/documentfragment~DocumentFragment|module:engine/model/element~Node} conversionResult Converted model item.
  * @property {Map<String, module:engine/model/range~Range>} markers List of static markers.
  */