瀏覽代碼

Merge branch 'master' into t/ckeditor5-undo/97

Maciej Gołaszewski 6 年之前
父節點
當前提交
9ef81f5442

+ 1 - 3
packages/ckeditor5-engine/src/view/placeholder.js

@@ -140,9 +140,7 @@ export function hidePlaceholder( writer, element ) {
  * {@link module:engine/view/placeholder~enablePlaceholder `enablePlaceholder()`} in that case or make
  * sure the correct element is passed to the helper.
  *
- * @param {module:engine/view/downcastwriter~DowncastWriter} writer
  * @param {module:engine/view/element~Element} element
- * @param {String} text
  * @returns {Boolean}
  */
 export function needsPlaceholder( element ) {
@@ -176,7 +174,7 @@ export function needsPlaceholder( element ) {
 // Updates all placeholders associated with a document in a post–fixer callback.
 //
 // @private
-// @param { module:engine/model/document~Document} doc
+// @param { module:engine/view/document~Document} doc
 // @param {module:engine/view/downcastwriter~DowncastWriter} writer
 // @returns {Boolean} True if any changes were made to the view document.
 function updateDocumentPlaceholders( doc, writer ) {

+ 3 - 0
packages/ckeditor5-engine/tests/dev-utils/enableenginedebug.js

@@ -558,6 +558,9 @@ describe( 'debug tools', () => {
 			const view = editor.editing.view;
 			const viewDoc = view.document;
 
+			// Reset model document version to ensure it will start at 0.
+			model.document.version = 0;
+
 			model.change( () => {
 				const insert = new InsertOperation( ModelPosition._createAt( modelRoot, 0 ), new ModelText( 'foobar' ), 0 );
 				model.applyOperation( insert );