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

Commit

Permalink
Merge branch 'master' into t/ckeditor5/742
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Piechaczek committed Apr 4, 2018
2 parents 57cbf0a + 7d88f9e commit a4095ac
Show file tree
Hide file tree
Showing 50 changed files with 140 additions and 83 deletions.
6 changes: 5 additions & 1 deletion src/button/buttonview.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ export default class ButtonView extends View {

attributes: {
class: [
'ck',
'ck-button',
bind.to( 'isEnabled', value => value ? 'ck-enabled' : 'ck-disabled' ),
bind.if( 'isVisible', 'ck-hidden', value => !value ),
Expand Down Expand Up @@ -199,7 +200,10 @@ export default class ButtonView extends View {
tag: 'span',

attributes: {
class: [ 'ck-button__label' ]
class: [
'ck',
'ck-button__label'
]
},

children: [
Expand Down
1 change: 1 addition & 0 deletions src/dropdown/button/splitbuttonview.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export default class SplitButtonView extends View {

attributes: {
class: [
'ck',
'ck-splitbutton',
bind.if( 'isVisible', 'ck-hidden', value => !value ),
this.arrowView.bindTemplate.if( 'isOn', 'ck-splitbutton_open' )
Expand Down
1 change: 1 addition & 0 deletions src/dropdown/dropdownpanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export default class DropdownPanelView extends View {

attributes: {
class: [
'ck',
'ck-reset',
'ck-dropdown__panel',
bind.if( 'isVisible', 'ck-dropdown__panel-visible' )
Expand Down
1 change: 1 addition & 0 deletions src/dropdown/dropdownview.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export default class DropdownView extends View {

attributes: {
class: [
'ck',
'ck-dropdown',
bind.to( 'isEnabled', isEnabled => isEnabled ? '' : 'ck-disabled' )
]
Expand Down
6 changes: 3 additions & 3 deletions src/editableui/editableuiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ export default class EditableUIView extends View {
tag: 'div',
attributes: {
class: [
bind.to( 'isFocused', value => value ? 'ck-focused' : 'ck-blurred' ),
'ck',
'ck-editor__editable',
'ck-content',
'ck-rounded-corners'
'ck-editor__editable',
'ck-rounded-corners',
bind.to( 'isFocused', value => value ? 'ck-focused' : 'ck-blurred' )
],
contenteditable: bind.to( 'isReadOnly', value => !value ),
}
Expand Down
12 changes: 10 additions & 2 deletions src/editorui/boxed/boxededitoruiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export default class BoxedEditorUIView extends EditorUIView {

attributes: {
class: [
'ck',
'ck-reset',
'ck-editor',
'ck-rounded-corners'
Expand All @@ -75,15 +76,22 @@ export default class BoxedEditorUIView extends EditorUIView {
{
tag: 'div',
attributes: {
class: 'ck-editor__top ck-reset_all',
class: [
'ck',
'ck-editor__top',
'ck-reset_all'
],
role: 'presentation'
},
children: this.top
},
{
tag: 'div',
attributes: {
class: 'ck-editor__main',
class: [
'ck',
'ck-editor__main'
],
role: 'presentation'
},
children: this.main
Expand Down
5 changes: 3 additions & 2 deletions src/editorui/editoruiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ export default class EditorUIView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-reset_all',
'ck-body',
'ck-rounded-corners',
'ck-reset_all'
'ck-rounded-corners'
]
},
children: this.body
Expand Down
5 changes: 4 additions & 1 deletion src/icon/iconview.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ export default class IconView extends View {
tag: 'svg',
ns: 'http://www.w3.org/2000/svg',
attributes: {
class: 'ck-icon',
class: [
'ck',
'ck-icon'
],
viewBox: bind.to( 'viewBox' )
}
} );
Expand Down
5 changes: 4 additions & 1 deletion src/iframe/iframeview.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ export default class IframeView extends View {
this.setTemplate( {
tag: 'iframe',
attributes: {
class: [ 'ck-reset_all' ],
class: [
'ck',
'ck-reset_all'
],
// It seems that we need to allow scripts in order to be able to listen to events.
// TODO: Research that. Perhaps the src must be set?
sandbox: 'allow-same-origin allow-scripts'
Expand Down
1 change: 1 addition & 0 deletions src/inputtext/inputtextview.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export default class InputTextView extends View {
attributes: {
type: 'text',
class: [
'ck',
'ck-input',
'ck-input-text'
],
Expand Down
1 change: 1 addition & 0 deletions src/label/labelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default class LabelView extends View {
tag: 'label',
attributes: {
class: [
'ck',
'ck-label'
],
for: bind.to( 'for' )
Expand Down
1 change: 1 addition & 0 deletions src/labeledinput/labeledinputview.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export default class LabeledInputView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-labeled-input',
bind.if( 'isReadOnly', 'ck-disabled' )
]
Expand Down
1 change: 1 addition & 0 deletions src/list/listitemview.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default class ListItemView extends View {

attributes: {
class: [
'ck',
'ck-list__item',
bind.to( 'class' ),
bind.if( 'isActive', 'ck-list__item_active' )
Expand Down
1 change: 1 addition & 0 deletions src/list/listview.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default class ListView extends View {

attributes: {
class: [
'ck',
'ck-reset',
'ck-list'
]
Expand Down
1 change: 1 addition & 0 deletions src/panel/balloon/balloonpanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ export default class BalloonPanelView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-balloon-panel',
bind.to( 'position', value => `ck-balloon-panel_${ value }` ),
bind.if( 'isVisible', 'ck-balloon-panel_visible' ),
Expand Down
3 changes: 3 additions & 0 deletions src/panel/sticky/stickypanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ export default class StickyPanelView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-sticky-panel__placeholder'
],
style: {
Expand All @@ -177,6 +178,7 @@ export default class StickyPanelView extends View {

attributes: {
class: [
'ck',
'ck-sticky-panel__content',
// Toggle class of the panel when "sticky" state changes in the view.
bind.if( 'isSticky', 'ck-sticky-panel__content_sticky' ),
Expand Down Expand Up @@ -206,6 +208,7 @@ export default class StickyPanelView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-sticky-panel'
]
},
Expand Down
1 change: 1 addition & 0 deletions src/toolbar/toolbarseparatorview.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default class ToolbarSeparatorView extends View {
tag: 'span',
attributes: {
class: [
'ck',
'ck-toolbar__separator'
]
}
Expand Down
1 change: 1 addition & 0 deletions src/toolbar/toolbarview.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export default class ToolbarView extends View {
tag: 'div',
attributes: {
class: [
'ck',
'ck-toolbar',
bind.if( 'isVertical', 'ck-toolbar_vertical' ),
bind.to( 'className' )
Expand Down
2 changes: 2 additions & 0 deletions src/tooltip/tooltipview.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export default class TooltipView extends View {
tag: 'span',
attributes: {
class: [
'ck',
'ck-tooltip',
bind.to( 'position', position => 'ck-tooltip_' + position ),
bind.if( 'text', 'ck-hidden', value => !value.trim() )
Expand All @@ -69,6 +70,7 @@ export default class TooltipView extends View {

attributes: {
class: [
'ck',
'ck-tooltip__text'
]
},
Expand Down
5 changes: 4 additions & 1 deletion tests/button/buttonview.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ describe( 'ButtonView', () => {

it( 'creates #labelView', () => {
expect( view.labelView ).to.be.instanceOf( View );
expect( view.labelView.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.labelView.element.classList.contains( 'ck-button__label' ) ).to.be.true;
} );

it( 'creates #iconView', () => {
Expand All @@ -45,7 +47,8 @@ describe( 'ButtonView', () => {
describe( '<button> bindings', () => {
describe( 'class', () => {
it( 'is set initially', () => {
expect( view.element.classList ).to.have.length( 3 );
expect( view.element.classList ).to.have.length( 4 );
expect( view.element.classList.contains( 'ck' ) ).to.true;
expect( view.element.classList.contains( 'ck-button' ) ).to.true;
expect( view.element.classList.contains( 'ck-enabled' ) ).to.true;
expect( view.element.classList.contains( 'ck-off' ) ).to.true;
Expand Down
1 change: 1 addition & 0 deletions tests/dropdown/button/splitbuttonview.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe( 'SplitButtonView', () => {

it( 'creates element from template', () => {
expect( view.element.tagName ).to.equal( 'DIV' );
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-splitbutton' ) ).to.be.true;
} );

Expand Down
1 change: 1 addition & 0 deletions tests/dropdown/dropdownpanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe( 'DropdownPanelView', () => {
} );

it( 'creates element from template', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-reset' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-dropdown__panel' ) ).to.be.true;
} );
Expand Down
1 change: 1 addition & 0 deletions tests/dropdown/dropdownview.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe( 'DropdownView', () => {
} );

it( 'creates #element from template', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-dropdown' ) ).to.be.true;
expect( view.element.children ).to.have.length( 2 );
expect( view.element.children[ 0 ] ).to.equal( buttonView.element );
Expand Down
1 change: 1 addition & 0 deletions tests/editableui/editableuiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ describe( 'EditableUIView', () => {
view.render();
expect( view.element ).to.equal( editableElement );
expect( view.element ).to.equal( view.editableElement );
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-editor__editable' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-rounded-corners' ) ).to.be.true;
expect( view.externalElement ).to.equal( editableElement );
Expand Down
1 change: 1 addition & 0 deletions tests/editorui/boxed/boxededitoruiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ describe( 'BoxedEditorUIView', () => {
} );

it( 'bootstraps the view element from template', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-editor' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-reset' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-rounded-corners' ) ).to.be.true;
Expand Down
1 change: 1 addition & 0 deletions tests/editorui/editoruiview.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ describe( 'EditorUIView', () => {
const el = view._bodyCollectionContainer;

expect( el.parentNode ).to.equal( document.body );
expect( el.classList.contains( 'ck' ) ).to.be.true;
expect( el.classList.contains( 'ck-body' ) ).to.be.true;
expect( el.classList.contains( 'ck-rounded-corners' ) ).to.be.true;
expect( el.classList.contains( 'ck-reset_all' ) ).to.be.true;
Expand Down
3 changes: 2 additions & 1 deletion tests/icon/iconview.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ describe( 'IconView', () => {

it( 'creates element from template', () => {
expect( view.element.tagName ).to.equal( 'svg' );
expect( view.element.getAttribute( 'class' ) ).to.equal( 'ck-icon' );
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-icon' ) ).to.be.true;
expect( view.element.getAttribute( 'viewBox' ) ).to.equal( '0 0 20 20' );
} );
} );
Expand Down
1 change: 1 addition & 0 deletions tests/iframe/iframeview.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ describe( 'IframeView', () => {
view.render();
document.body.appendChild( view.element );

expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-reset_all' ) ).to.be.true;
expect( view.element.attributes.getNamedItem( 'sandbox' ).value ).to.equal( 'allow-same-origin allow-scripts' );

Expand Down
1 change: 1 addition & 0 deletions tests/inputtext/inputtextview.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe( 'InputTextView', () => {
it( 'should creates element from template', () => {
expect( view.element.tagName ).to.equal( 'INPUT' );
expect( view.element.type ).to.equal( 'text' );
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-input' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-input-text' ) ).to.be.true;
} );
Expand Down
1 change: 1 addition & 0 deletions tests/label/labelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ describe( 'LabelView', () => {
describe( 'constructor()', () => {
it( 'should create element from template', () => {
expect( view.element.tagName ).to.equal( 'LABEL' );
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-label' ) ).to.be.true;
} );
} );
Expand Down
1 change: 1 addition & 0 deletions tests/labeledinput/labeledinputview.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe( 'LabeledInputView', () => {

describe( 'template', () => {
it( 'should have the CSS class', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-labeled-input' ) ).to.be.true;
} );

Expand Down
5 changes: 3 additions & 2 deletions tests/list/listitemview.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe( 'ListItemView', () => {

describe( 'constructor()', () => {
it( 'creates element from template', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-list__item' ) ).to.be.true;
} );

Expand Down Expand Up @@ -74,15 +75,15 @@ describe( 'ListItemView', () => {
describe( 'DOM bindings', () => {
describe( '"class" attribute', () => {
it( 'reacts on view#class', () => {
expect( view.element.classList ).to.have.length( 1 );
expect( view.element.classList ).to.have.length( 2 );

view.set( 'class', 'foo' );

expect( view.element.classList.contains( 'foo' ) ).to.be.true;
} );

it( 'reacts on view#isActive', () => {
expect( view.element.classList ).to.have.length( 1 );
expect( view.element.classList ).to.have.length( 2 );

view.set( 'isActive', true );

Expand Down
1 change: 1 addition & 0 deletions tests/list/listview.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ describe( 'ListView', () => {

describe( 'constructor()', () => {
it( 'creates element from template', () => {
expect( view.element.classList.contains( 'ck' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-reset' ) ).to.be.true;
expect( view.element.classList.contains( 'ck-list' ) ).to.be.true;
} );
Expand Down
1 change: 1 addition & 0 deletions tests/panel/balloon/balloonpanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe( 'BalloonPanelView', () => {
describe( 'constructor()', () => {
it( 'should create element from template', () => {
expect( view.element.tagName ).to.equal( 'DIV' );
expect( view.element.classList.contains( 'ck' ) ).to.true;
expect( view.element.classList.contains( 'ck-balloon-panel' ) ).to.true;
} );

Expand Down
3 changes: 3 additions & 0 deletions tests/panel/sticky/stickypanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ describe( 'StickyPanelView', () => {

it( 'should create element from template', () => {
expect( element.tagName ).to.equal( 'DIV' );
expect( element.classList.contains( 'ck' ) ).to.true;
expect( element.classList.contains( 'ck-sticky-panel' ) ).to.true;

expect( placeholderElement.tagName ).to.equal( 'DIV' );
expect( placeholderElement.classList.contains( 'ck' ) ).to.true;
expect( placeholderElement.classList.contains( 'ck-sticky-panel__placeholder' ) ).to.true;

expect( contentElement.tagName ).to.equal( 'DIV' );
expect( contentElement.classList.contains( 'ck' ) ).to.true;
expect( contentElement.classList.contains( 'ck-sticky-panel__content' ) ).to.true;
} );

Expand Down
Loading

0 comments on commit a4095ac

Please sign in to comment.