Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

i/6553: Replace .ck-labeled-view class with .ck-labeled-field-view #553

Merged
merged 13 commits into from
Apr 8, 2020
Merged

i/6553: Replace .ck-labeled-view class with .ck-labeled-field-view #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
07760ea
Replace .ck-labeled-view class with .ck-labeled-field-view
panr Apr 6, 2020
c0bef9c
Trigger CI
panr Apr 6, 2020
a4e4f91
Feature: View collection can now also be initialized though construct…
mlewand Feb 19, 2020
daeceee
Internal: Restored locale support for BodyCollection to work correctly.
mlewand Feb 19, 2020
379a462
Internal: Locale instance is required only for BodyCollection - so th…
mlewand Feb 19, 2020
c1114ee
Revert "Internal: Restored locale support for BodyCollection to work …
mlewand Feb 19, 2020
5725720
Tests: Added unit test coverage for BodyCollection constructor.
mlewand Feb 19, 2020
a62f479
Internal: Collection now works on iterables.
mlewand Feb 19, 2020
f5982c2
Docs: Views can be actually an iterable.
mlewand Feb 26, 2020
0519436
Docs: Adjusted code snippet for the view#createCollection() method.
mlewand Apr 3, 2020
063076f
Tests: Added a test ensuring that the BodyCollection constructor is p…
mlewand Apr 3, 2020
d0afb47
Internal: Updated the version of Node.js on Travis. See ckeditor/cked…
pomek Apr 6, 2020
d5ea06f
Merge branch 'master' into i/6553
panr Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/labeledfield/labeledfieldview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export default class LabeledFieldView extends View {
constructor( locale, viewCreator ) {
super( locale );

const viewUid = `ck-labeled-view-${ uid() }`;
const statusUid = `ck-labeled-view-status-${ uid() }`;
const viewUid = `ck-labeled-field-view-${ uid() }`;
const statusUid = `ck-labeled-field-view-status-${ uid() }`;

/**
* The field view that gets labeled.
Expand Down Expand Up @@ -168,7 +168,7 @@ export default class LabeledFieldView extends View {
attributes: {
class: [
'ck',
'ck-labeled-view',
'ck-labeled-field-view',
bind.to( 'class' ),
bind.if( 'isEnabled', 'ck-disabled', value => !value )
]
Expand Down Expand Up @@ -215,8 +215,8 @@ export default class LabeledFieldView extends View {
attributes: {
class: [
'ck',
'ck-labeled-view__status',
bind.if( 'errorText', 'ck-labeled-view__status_error' ),
'ck-labeled-field-view__status',
bind.if( 'errorText', 'ck-labeled-field-view__status_error' ),
bind.if( '_statusText', 'ck-hidden', value => !value )
],
id: statusUid,
Expand Down
12 changes: 6 additions & 6 deletions tests/labeledfield/labeledfieldview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe( 'LabeledFieldView', () => {

expect( labeledInput.statusView.element.tagName ).to.equal( 'DIV' );
expect( labeledInput.statusView.element.classList.contains( 'ck' ) ).to.be.true;
expect( labeledInput.statusView.element.classList.contains( 'ck-labeled-view__status' ) ).to.be.true;
expect( labeledInput.statusView.element.classList.contains( 'ck-labeled-field-view__status' ) ).to.be.true;
} );

it( 'should allow pairing #view and #labelView by unique id', () => {
Expand All @@ -83,7 +83,7 @@ describe( 'LabeledFieldView', () => {
describe( 'template', () => {
it( 'should have the CSS class', () => {
expect( labeledInput.element.classList.contains( 'ck' ) ).to.be.true;
expect( labeledInput.element.classList.contains( 'ck-labeled-view' ) ).to.be.true;
expect( labeledInput.element.classList.contains( 'ck-labeled-field-view' ) ).to.be.true;
} );

it( 'should have #labeledInput', () => {
Expand Down Expand Up @@ -116,13 +116,13 @@ describe( 'LabeledFieldView', () => {

labeledInput.errorText = '';
expect( statusElement.classList.contains( 'ck-hidden' ) ).to.be.true;
expect( statusElement.classList.contains( 'ck-labeled-view__status_error' ) ).to.be.false;
expect( statusElement.classList.contains( 'ck-labeled-field-view__status_error' ) ).to.be.false;
expect( statusElement.hasAttribute( 'role' ) ).to.be.false;
expect( statusElement.innerHTML ).to.equal( '' );

labeledInput.errorText = 'foo';
expect( statusElement.classList.contains( 'ck-hidden' ) ).to.be.false;
expect( statusElement.classList.contains( 'ck-labeled-view__status_error' ) ).to.be.true;
expect( statusElement.classList.contains( 'ck-labeled-field-view__status_error' ) ).to.be.true;
expect( statusElement.getAttribute( 'role' ) ).to.equal( 'alert' );
expect( statusElement.innerHTML ).to.equal( 'foo' );
} );
Expand All @@ -132,13 +132,13 @@ describe( 'LabeledFieldView', () => {

labeledInput.infoText = '';
expect( statusElement.classList.contains( 'ck-hidden' ) ).to.be.true;
expect( statusElement.classList.contains( 'ck-labeled-view__status_error' ) ).to.be.false;
expect( statusElement.classList.contains( 'ck-labeled-field-view__status_error' ) ).to.be.false;
expect( statusElement.hasAttribute( 'role' ) ).to.be.false;
expect( statusElement.innerHTML ).to.equal( '' );

labeledInput.infoText = 'foo';
expect( statusElement.classList.contains( 'ck-hidden' ) ).to.be.false;
expect( statusElement.classList.contains( 'ck-labeled-view__status_error' ) ).to.be.false;
expect( statusElement.classList.contains( 'ck-labeled-field-view__status_error' ) ).to.be.false;
expect( statusElement.hasAttribute( 'role' ) ).to.be.false;
expect( statusElement.innerHTML ).to.equal( 'foo' );
} );
Expand Down