Sfoglia il codice sorgente

Fixed initialization issues.

Piotr Jasiun 9 anni fa
parent
commit
2202b1e344

+ 0 - 10
packages/ckeditor5-engine/src/treemodel/node.js

@@ -5,8 +5,6 @@
 
 'use strict';
 
-import Position from './position.js';
-
 import clone from '../../utils/lib/lodash/clone.js';
 import toMap from '../../utils/tomap.js';
 import CKEditorError from '../../utils/ckeditorerror.js';
@@ -179,14 +177,6 @@ export default class Node {
 		return this._attrs[ Symbol.iterator ]();
 	}
 
-	positionBefore() {
-		return Position.createBefore( this );
-	}
-
-	positionAfter() {
-		return Position.createAfter( this );
-	}
-
 	/**
 	 * Custom toJSON method to solve child-parent circular dependencies.
 	 *

+ 1 - 1
packages/ckeditor5-engine/src/treeview/domconverter.js

@@ -71,7 +71,7 @@ export default class DomConverter {
 
 		this.blockFillerCreator = options.blockFiller;
 
-		this._templateBlockFiller = options.blockFiller();
+		this._templateBlockFiller = options.blockFiller( window.document );
 	}
 
 	/**

+ 0 - 10
packages/ckeditor5-engine/src/treeview/node.js

@@ -5,8 +5,6 @@
 
 'use strict';
 
-import Position from './position.js';
-
 import CKEditorError from '../../utils/ckeditorerror.js';
 import EmitterMixin from '../../utils/emittermixin.js';
 import mix from '../../utils/mix.js';
@@ -158,14 +156,6 @@ export default class Node {
 		}
 	}
 
-	positionBefore() {
-		return Position.createBefore( this );
-	}
-
-	positionAfter() {
-		return Position.createAfter( this );
-	}
-
 	/**
 	 * Clones this node.
 	 *

+ 3 - 4
packages/ckeditor5-engine/src/treeview/renderer.js

@@ -9,10 +9,9 @@ import diff from '../../utils/diff.js';
 import ViewText from './text.js';
 
 import ViewElement from './element.js';
->>>>>>> 3849f41... Move render methods.
-import { INLINE_FILLER, INLINE_FILLER_SIZE } from './domconverter.js';
+import ViewPosition from './position.js';
 
-import diff from '../utils-diff.js';
+import { INLINE_FILLER, INLINE_FILLER_SIZE } from './domconverter.js';
 
 import CKEditorError from '../../utils/ckeditorerror.js';
 import EmitterMixin from '../../utils/emittermixin.js';
@@ -213,7 +212,7 @@ export default class Renderer {
 		}
 
 		if ( selectionPosition.parent instanceof ViewText ) {
-			if ( fillerPosition.isEqual( selectionPosition.parent.positionBefore() ) ) {
+			if ( fillerPosition.isEqual( ViewPosition.createBefore( selectionPosition.parent ) ) ) {
 				return true;
 			}
 		}

+ 1 - 1
packages/ckeditor5-engine/src/treeview/treeview.js

@@ -68,7 +68,7 @@ export default class TreeView {
 		 * @readonly
 		 * @member {engine.treeView.Renderer} engine.treeView.TreeView#renderer
 		 */
-		this.renderer = new Renderer( this.domConverter );
+		this.renderer = new Renderer( this );
 
 		/**
 		 * Set of registered {@link engine.treeView.Observer observers}.