Explorar o código

Fixes after rebase on master.

Piotr Jasiun %!s(int64=9) %!d(string=hai) anos
pai
achega
73aa2b3d07

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

@@ -13,7 +13,7 @@ import { INLINE_FILLER_LENGTH, startsWithFiller } from './filler.js';
 
 import mix from '../../utils/mix.js';
 import EmitterMixin from '../../utils/emittermixin.js';
-import { keyNames } from '../../utils/keyboard.js';
+import { keyCodes } from '../../utils/keyboard.js';
 
 /**
  * TreeView class creates an abstract layer over the content editable area.
@@ -201,7 +201,7 @@ mix( TreeView, EmitterMixin );
 
 // Move cursor from the end of the inline filler to the begging of it when, so the filler does not break navigation.
 function jumpOverInlineFiller( evt, data ) {
-	if ( data.keyCode == keyNames.arrowleft ) {
+	if ( data.keyCode == keyCodes.arrowleft ) {
 		const domSelection = data.domTarget.ownerDocument.defaultView.getSelection();
 
 		if ( domSelection.rangeCount == 1 && domSelection.getRangeAt( 0 ).collapsed ) {

+ 4 - 4
packages/ckeditor5-engine/tests/treeview/domconverter/dom-to-view.js

@@ -14,7 +14,7 @@ import { INLINE_FILLER, INLINE_FILLER_LENGTH, NBSP_FILLER } from '/ckeditor5/eng
 
 import { parse, stringify } from '/tests/engine/_utils/view.js';
 
-import utils from '/ckeditor5/utils/utils.js';
+import count from '/ckeditor5/utils/count.js';
 import createElement from '/ckeditor5/utils/dom/createelement.js';
 
 describe( 'DomConverter', () => {
@@ -40,7 +40,7 @@ describe( 'DomConverter', () => {
 			expect( viewP.name ).to.equal( 'p' );
 
 			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
-			expect( utils.count( viewP.getAttributeKeys() ) ).to.equal( 1 );
+			expect( count( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 2 );
 			expect( viewP.getChild( 0 ).name ).to.equal( 'img' );
@@ -61,7 +61,7 @@ describe( 'DomConverter', () => {
 			expect( viewP.name ).to.equal( 'p' );
 
 			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
-			expect( utils.count( viewP.getAttributeKeys() ) ).to.equal( 1 );
+			expect( count( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 2 );
 			expect( viewP.getChild( 0 ).name ).to.equal( 'img' );
@@ -86,7 +86,7 @@ describe( 'DomConverter', () => {
 			expect( viewP.name ).to.equal( 'p' );
 
 			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
-			expect( utils.count( viewP.getAttributeKeys() ) ).to.equal( 1 );
+			expect( count( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 0 );
 			expect( converter.getCorrespondingDom( viewP ) ).to.not.equal( domP );

+ 6 - 6
packages/ckeditor5-engine/tests/treeview/treeview/jumpoverinlinefiller.js

@@ -12,7 +12,7 @@ import TreeView from '/ckeditor5/engine/treeview/treeview.js';
 import KeyObserver from '/ckeditor5/engine/treeview/observer/keyobserver.js';
 import { INLINE_FILLER_LENGTH, isInlineFiller, startsWithFiller } from '/ckeditor5/engine/treeview/filler.js';
 
-import { keyNames } from '/ckeditor5/utils/keyboard.js';
+import { keyCodes } from '/ckeditor5/utils/keyboard.js';
 
 import { parse, setData } from '/tests/engine/_utils/view.js';
 
@@ -33,7 +33,7 @@ describe( 'TreeView', () => {
 			setData( treeView, '<container:p>foo<attribute:b>[]</attribute:b>bar</container:p>' );
 			treeView.render();
 
-			treeView.fire( 'keydown', { keyCode: keyNames.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
+			treeView.fire( 'keydown', { keyCode: keyCodes.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
 
 			const domRange = document.getSelection().getRangeAt( 0 );
 			expect( isInlineFiller( domRange.startContainer ) ).to.be.true;
@@ -45,7 +45,7 @@ describe( 'TreeView', () => {
 			setData( treeView, '<container:p>foo<attribute:b>[]</attribute:b>bar</container:p>' );
 			treeView.render();
 
-			treeView.fire( 'keydown', { keyCode: keyNames.arrowright, domTarget: treeView.domRoots.get( 'main' ) } );
+			treeView.fire( 'keydown', { keyCode: keyCodes.arrowright, domTarget: treeView.domRoots.get( 'main' ) } );
 
 			const domRange = document.getSelection().getRangeAt( 0 );
 			expect( isInlineFiller( domRange.startContainer ) ).to.be.true;
@@ -57,7 +57,7 @@ describe( 'TreeView', () => {
 			setData( treeView, '<container:p>foo<attribute:b>{x}</attribute:b>bar</container:p>' );
 			treeView.render();
 
-			treeView.fire( 'keydown', { keyCode: keyNames.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
+			treeView.fire( 'keydown', { keyCode: keyCodes.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
 
 			const domRange = document.getSelection().getRangeAt( 0 );
 			expect( domRange.startContainer.data ).to.equal( 'x' );
@@ -70,7 +70,7 @@ describe( 'TreeView', () => {
 			setData( treeView, '<container:p>foo<attribute:b>{}x</attribute:b>bar</container:p>' );
 			treeView.render();
 
-			treeView.fire( 'keydown', { keyCode: keyNames.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
+			treeView.fire( 'keydown', { keyCode: keyCodes.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
 
 			const domRange = document.getSelection().getRangeAt( 0 );
 			expect( domRange.startContainer.data ).to.equal( 'x' );
@@ -90,7 +90,7 @@ describe( 'TreeView', () => {
 			treeView.selection.addRange( ViewRange.createFromParentsAndOffsets( viewTextX, 1, viewTextX, 1 ) );
 			treeView.render();
 
-			treeView.fire( 'keydown', { keyCode: keyNames.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
+			treeView.fire( 'keydown', { keyCode: keyCodes.arrowleft, domTarget: treeView.domRoots.get( 'main' ) } );
 
 			const domRange = document.getSelection().getRangeAt( 0 );
 			expect( startsWithFiller( domRange.startContainer ) ).to.be.true;