Explorar el Código

Renamed attr* to attribute*.

Piotr Jasiun hace 10 años
padre
commit
8131518e45

+ 3 - 3
packages/ckeditor5-engine/src/treeview/converter.js

@@ -53,8 +53,8 @@ export default class Converter {
 				this.bindElements( domElement, viewNode );
 			}
 
-			for ( let key of viewNode.getAttrKeys() ) {
-				domElement.setAttribute( key, viewNode.getAttr( key ) );
+			for ( let key of viewNode.getAttributeKeys() ) {
+				domElement.setAttribute( key, viewNode.getAttribute( key ) );
 			}
 
 			if ( options.withChildren || options.withChildren === undefined ) {
@@ -91,7 +91,7 @@ export default class Converter {
 			const attrs = domElement.attributes;
 
 			for ( let i = attrs.length - 1; i >= 0; i-- ) {
-				viewElement.setAttr( attrs[ i ].name, attrs[ i ].value );
+				viewElement.setAttribute( attrs[ i ].name, attrs[ i ].value );
 			}
 
 			if ( options.withChildren || options.withChildren === undefined ) {

+ 5 - 5
packages/ckeditor5-engine/src/treeview/element.js

@@ -51,19 +51,19 @@ export default class Element extends Node {
 		return this._children[ Symbol.iterator ]();
 	}
 
-	getAttrKeys() {
+	getAttributeKeys() {
 		return this._attrs.keys();
 	}
 
-	getAttr( key ) {
+	getAttribute( key ) {
 		return this._attrs.get( key );
 	}
 
-	hasAttr( key ) {
+	hasAttribute( key ) {
 		return this._attrs.has( key );
 	}
 
-	setAttr( key, value ) {
+	setAttribute( key, value ) {
 		this._fireChange( 'ATTRIBUTES', this );
 
 		this._attrs.set( key, value );
@@ -84,7 +84,7 @@ export default class Element extends Node {
 		}
 	}
 
-	removeAttr( key ) {
+	removeAttribute( key ) {
 		this._fireChange( 'ATTRIBUTES', this );
 
 		return this._attrs.delete( key );

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

@@ -75,16 +75,16 @@ export default class Renderer {
 		function updateAttrs( viewElement ) {
 			const domElement = converter.getCorespondingDom( viewElement );
 			const domAttrKeys = Array.from( domElement.attributes ).map( attr => attr.name );
-			const viewAttrKeys = viewElement.getAttrKeys();
+			const viewAttrKeys = viewElement.getAttributeKeys();
 
 			// Add or overwrite attributes.
 			for ( let key of viewAttrKeys ) {
-				domElement.setAttribute( key, viewElement.getAttr( key ) );
+				domElement.setAttribute( key, viewElement.getAttribute( key ) );
 			}
 
 			// Remove from DOM attributes which do not exists in the view.
 			for ( let key of domAttrKeys ) {
-				if ( !viewElement.hasAttr( key ) ) {
+				if ( !viewElement.hasAttribute( key ) ) {
 					domElement.removeAttribute( key );
 				}
 			}

+ 9 - 9
packages/ckeditor5-engine/tests/treeview/converter.js

@@ -78,8 +78,8 @@ describe( 'converter', () => {
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
 
-			expect( viewP.getAttr( 'class' ) ).to.equal( 'foo' );
-			expect( getIteratorCount( viewP.getAttrKeys() ) ).to.equal( 1 );
+			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
+			expect( getIteratorCount( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 2 );
 			expect( viewP.getChild( 0 ).name ).to.equal( 'img' );
@@ -104,8 +104,8 @@ describe( 'converter', () => {
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
 
-			expect( viewP.getAttr( 'class' ) ).to.equal( 'foo' );
-			expect( getIteratorCount( viewP.getAttrKeys() ) ).to.equal( 1 );
+			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
+			expect( getIteratorCount( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 2 );
 			expect( viewP.getChild( 0 ).name ).to.equal( 'img' );
@@ -134,8 +134,8 @@ describe( 'converter', () => {
 			expect( viewP ).to.be.an.instanceof( ViewElement );
 			expect( viewP.name ).to.equal( 'p' );
 
-			expect( viewP.getAttr( 'class' ) ).to.equal( 'foo' );
-			expect( getIteratorCount( viewP.getAttrKeys() ) ).to.equal( 1 );
+			expect( viewP.getAttribute( 'class' ) ).to.equal( 'foo' );
+			expect( getIteratorCount( viewP.getAttributeKeys() ) ).to.equal( 1 );
 
 			expect( viewP.getChildCount() ).to.equal( 0 );
 			expect( converter.getCorespondingDom( viewP ) ).to.not.equal( domP );
@@ -148,7 +148,7 @@ describe( 'converter', () => {
 			const viewText = new ViewText( 'foo' );
 			const viewP = new ViewElement( 'p' );
 
-			viewP.setAttr( 'class', 'foo' );
+			viewP.setAttribute( 'class', 'foo' );
 
 			viewP.appendChildren( viewImg );
 			viewP.appendChildren( viewText );
@@ -178,7 +178,7 @@ describe( 'converter', () => {
 			const viewText = new ViewText( 'foo' );
 			const viewP = new ViewElement( 'p' );
 
-			viewP.setAttr( 'class', 'foo' );
+			viewP.setAttribute( 'class', 'foo' );
 
 			viewP.appendChildren( viewImg );
 			viewP.appendChildren( viewText );
@@ -204,7 +204,7 @@ describe( 'converter', () => {
 			const viewText = new ViewText( 'foo' );
 			const viewP = new ViewElement( 'p' );
 
-			viewP.setAttr( 'class', 'foo' );
+			viewP.setAttribute( 'class', 'foo' );
 
 			viewP.appendChildren( viewImg );
 			viewP.appendChildren( viewText );

+ 24 - 24
packages/ckeditor5-engine/tests/treeview/element.js

@@ -21,15 +21,15 @@ describe( 'Element', () => {
 			expect( el ).to.be.an.instanceof( Node );
 			expect( el ).to.have.property( 'name' ).that.equals( 'p' );
 			expect( el ).to.have.property( 'parent' ).that.is.null;
-			expect( getIteratorCount( el.getAttrKeys() ) ).to.equal( 0 );
+			expect( getIteratorCount( el.getAttributeKeys() ) ).to.equal( 0 );
 		} );
 
 		it( 'should create element with attributes as plain object', () => {
 			const el = new ViewElement( 'p', { 'foo': 'bar' } );
 
 			expect( el ).to.have.property( 'name' ).that.equals( 'p' );
-			expect( getIteratorCount( el.getAttrKeys() ) ).to.equal( 1 );
-			expect( el.getAttr( 'foo' ) ).to.equal( 'bar' );
+			expect( getIteratorCount( el.getAttributeKeys() ) ).to.equal( 1 );
+			expect( el.getAttribute( 'foo' ) ).to.equal( 'bar' );
 		} );
 
 		it( 'should create element with attributes as map', () => {
@@ -39,8 +39,8 @@ describe( 'Element', () => {
 			const el = new ViewElement( 'p', attrs );
 
 			expect( el ).to.have.property( 'name' ).that.equals( 'p' );
-			expect( getIteratorCount( el.getAttrKeys() ) ).to.equal( 1 );
-			expect( el.getAttr( 'foo' ) ).to.equal( 'bar' );
+			expect( getIteratorCount( el.getAttributeKeys() ) ).to.equal( 1 );
+			expect( el.getAttribute( 'foo' ) ).to.equal( 'bar' );
 		} );
 
 		it( 'should create element with children', () => {
@@ -146,34 +146,34 @@ describe( 'Element', () => {
 			el = new ViewElement( 'p' );
 		} );
 
-		describe( 'getAttr', () => {
+		describe( 'getAttribute', () => {
 			it( 'should return attribute', () => {
-				el.setAttr( 'foo', 'bar' );
+				el.setAttribute( 'foo', 'bar' );
 
-				expect( el.getAttr( 'foo' ) ).to.equal( 'bar' );
-				expect( el.getAttr( 'bom' ) ).to.not.be.ok;
+				expect( el.getAttribute( 'foo' ) ).to.equal( 'bar' );
+				expect( el.getAttribute( 'bom' ) ).to.not.be.ok;
 			} );
 		} );
 
-		describe( 'hasAttr', () => {
+		describe( 'hasAttribute', () => {
 			it( 'should return true if element has attribute', () => {
-				el.setAttr( 'foo', 'bar' );
+				el.setAttribute( 'foo', 'bar' );
 
-				expect( el.hasAttr( 'foo' ) ).to.be.true;
-				expect( el.hasAttr( 'bom' ) ).to.be.false;
+				expect( el.hasAttribute( 'foo' ) ).to.be.true;
+				expect( el.hasAttribute( 'bom' ) ).to.be.false;
 			} );
 		} );
 
-		describe( 'getAttrKeys', () => {
+		describe( 'getAttributeKeys', () => {
 			it( 'should return keys', () => {
-				el.setAttr( 'foo', true );
-				el.setAttr( 'bar', true );
+				el.setAttribute( 'foo', true );
+				el.setAttribute( 'bar', true );
 
 				const expected = [ 'foo', 'bar' ];
 				let i = 0;
 
-				for ( let child of el.getAttrKeys() ) {
-					expect( child ).to.equal( expected[ i ] );
+				for ( let key of el.getAttributeKeys() ) {
+					expect( key ).to.equal( expected[ i ] );
 					i++;
 				}
 
@@ -181,17 +181,17 @@ describe( 'Element', () => {
 			} );
 		} );
 
-		describe( 'removeAttr', () => {
+		describe( 'removeAttribute', () => {
 			it( 'should remove attributes', () => {
-				el.setAttr( 'foo', true );
+				el.setAttribute( 'foo', true );
 
-				expect( el.hasAttr( 'foo' ) ).to.be.true;
+				expect( el.hasAttribute( 'foo' ) ).to.be.true;
 
-				el.removeAttr( 'foo' );
+				el.removeAttribute( 'foo' );
 
-				expect( el.hasAttr( 'foo' ) ).to.be.false;
+				expect( el.hasAttribute( 'foo' ) ).to.be.false;
 
-				expect( getIteratorCount( el.getAttrKeys() ) ).to.equal( 0 );
+				expect( getIteratorCount( el.getAttributeKeys() ) ).to.equal( 0 );
 			} );
 		} );
 	} );

+ 5 - 5
packages/ckeditor5-engine/tests/treeview/node.js

@@ -126,7 +126,7 @@ describe( 'Node', () => {
 		beforeEach( () => {
 			text = new Text( 'foo' );
 			img = new Element( 'img' );
-			img.setAttr( 'src', 'img.png' );
+			img.setAttribute( 'src', 'img.png' );
 
 			root = new Element( 'p', { renderer: { markToSync: rootChangeSpy } } );
 			root.appendChildren( [ text, img ] );
@@ -145,14 +145,14 @@ describe( 'Node', () => {
 				imgChangeSpy( type, node );
 			} );
 
-			img.setAttr( 'width', 100 );
+			img.setAttribute( 'width', 100 );
 
 			sinon.assert.calledOnce( imgChangeSpy );
 			sinon.assert.calledWith( imgChangeSpy, 'ATTRIBUTES', img );
 		} );
 
 		it( 'should be fired on the parent', () => {
-			img.setAttr( 'width', 100 );
+			img.setAttribute( 'width', 100 );
 
 			sinon.assert.calledOnce( rootChangeSpy );
 			sinon.assert.calledWith( rootChangeSpy, 'ATTRIBUTES', img );
@@ -160,7 +160,7 @@ describe( 'Node', () => {
 
 		describe( 'setAttr', () => {
 			it( 'should fire change event', () => {
-				img.setAttr( 'width', 100 );
+				img.setAttribute( 'width', 100 );
 
 				sinon.assert.calledOnce( rootChangeSpy );
 				sinon.assert.calledWith( rootChangeSpy, 'ATTRIBUTES', img );
@@ -169,7 +169,7 @@ describe( 'Node', () => {
 
 		describe( 'removeAttr', () => {
 			it( 'should fire change event', () => {
-				img.removeAttr( 'src' );
+				img.removeAttribute( 'src' );
 
 				sinon.assert.calledOnce( rootChangeSpy );
 				sinon.assert.calledWith( rootChangeSpy, 'ATTRIBUTES', img );

+ 3 - 3
packages/ckeditor5-engine/tests/treeview/renderer.js

@@ -37,7 +37,7 @@ describe( 'Renderer', () => {
 		} );
 
 		it( 'should mark attributes which need update', () => {
-			viewNode.setAttr( 'class', 'foo' );
+			viewNode.setAttribute( 'class', 'foo' );
 
 			renderer.markToSync( 'ATTRIBUTES', viewNode );
 
@@ -108,7 +108,7 @@ describe( 'Renderer', () => {
 		} );
 
 		it( 'should update attributes', () => {
-			viewNode.setAttr( 'class', 'foo' );
+			viewNode.setAttribute( 'class', 'foo' );
 
 			renderer.markToSync( 'ATTRIBUTES', viewNode );
 			renderer.render();
@@ -119,7 +119,7 @@ describe( 'Renderer', () => {
 		} );
 
 		it( 'should remove attributes', () => {
-			viewNode.setAttr( 'class', 'foo' );
+			viewNode.setAttribute( 'class', 'foo' );
 			domNode.setAttribute( 'id', 'bar' );
 			domNode.setAttribute( 'class', 'bar' );
 

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

@@ -30,7 +30,7 @@ describe( 'TreeView', () => {
 
 			expect( treeView.converter.getCorespondingDom( treeView.viewRoot ) ).to.equal( domDiv );
 			expect( treeView.viewRoot.name ).to.equal( 'div' );
-			expect( treeView.viewRoot.getAttr( 'id' ) ).to.equal( 'editor' );
+			expect( treeView.viewRoot.getAttribute( 'id' ) ).to.equal( 'editor' );
 			expect( treeView.renderer.markedChildren.has( treeView.viewRoot ) ).to.be.true;
 		} );
 	} );