Sfoglia il codice sorgente

Changed: default position mapping algorithm should be used only if custom callbacks did not provide a result.

Szymon Cofalik 8 anni fa
parent
commit
f56b7a7c30
1 ha cambiato i file con 2 aggiunte e 4 eliminazioni
  1. 2 4
      packages/ckeditor5-engine/src/conversion/mapper.js

+ 2 - 4
packages/ckeditor5-engine/src/conversion/mapper.js

@@ -159,13 +159,12 @@ export default class Mapper {
 	toModelPosition( viewPosition ) {
 		const data = {
 			viewPosition: viewPosition,
-			modelPosition: this._defaultToModelPosition( viewPosition ),
 			mapper: this
 		};
 
 		this.fire( 'viewToModelPosition', data );
 
-		return data.modelPosition;
+		return data.modelPosition ? data.modelPosition : this._defaultToModelPosition( viewPosition );
 	}
 
 	/**
@@ -190,14 +189,13 @@ export default class Mapper {
 	 */
 	toViewPosition( modelPosition ) {
 		const data = {
-			viewPosition: this._defaultToViewPosition( modelPosition ),
 			modelPosition: modelPosition,
 			mapper: this
 		};
 
 		this.fire( 'modelToViewPosition', data );
 
-		return data.viewPosition;
+		return data.viewPosition ? data.viewPosition : this._defaultToViewPosition( modelPosition );
 	}
 
 	/**