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

Used EditorUI as a ClassicEditorUI parent class. #74

Merged
merged 2 commits into from
Jun 29, 2018
Merged

Used EditorUI as a ClassicEditorUI parent class. #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f689e23
Used EditorUI as a ClassicEditorUI parent class.
oskarwrobel Jun 26, 2018
e53f808
Removed unnecessary test case.
oskarwrobel Jun 27, 2018
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
39 changes: 5 additions & 34 deletions src/classiceditorui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,21 @@
* @module editor-classic/classiceditorui
*/

import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
import EditorUI from '@ckeditor/ckeditor5-core/src/editor/editorui';
import enableToolbarKeyboardFocus from '@ckeditor/ckeditor5-ui/src/toolbar/enabletoolbarkeyboardfocus';
import normalizeToolbarConfig from '@ckeditor/ckeditor5-ui/src/toolbar/normalizetoolbarconfig';

/**
* The classic editor UI class.
*
* @implements module:core/editor/editorui~EditorUI
* @extends module:core/editor/editorui~EditorUI
*/
export default class ClassicEditorUI {
export default class ClassicEditorUI extends EditorUI {
/**
* Creates an instance of the editor UI class.
*
* @param {module:core/editor/editor~Editor} editor The editor instance.
* @param {module:ui/editorui/editoruiview~EditorUIView} view The view of the UI.
* @inheritDoc
*/
constructor( editor, view ) {
/**
* @inheritDoc
*/
this.editor = editor;

/**
* @inheritDoc
*/
this.view = view;

/**
* @inheritDoc
*/
this.componentFactory = new ComponentFactory( editor );

/**
* @inheritDoc
*/
this.focusTracker = new FocusTracker();
super( editor, view );

/**
* A normalized `config.toolbar` object.
Expand Down Expand Up @@ -88,11 +66,4 @@ export default class ClassicEditorUI {
toolbar: this.view.toolbar
} );
}

/**
* Destroys the UI.
*/
destroy() {
this.view.destroy();
}
}
31 changes: 3 additions & 28 deletions tests/classiceditorui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@

/* globals document, Event */

import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
import View from '@ckeditor/ckeditor5-ui/src/view';

import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
import ClassicEditorUI from '../src/classiceditorui';
import EditorUI from '@ckeditor/ckeditor5-core/src/editor/editorui';
import ClassicEditorUIView from '../src/classiceditoruiview';

import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';

import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
import utils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
Expand Down Expand Up @@ -41,20 +39,8 @@ describe( 'ClassicEditorUI', () => {
} );

describe( 'constructor()', () => {
it( 'sets #editor', () => {
expect( ui.editor ).to.equal( editor );
} );

it( 'sets #view', () => {
expect( ui.view ).to.be.instanceOf( ClassicEditorUIView );
} );

it( 'creates #componentFactory factory', () => {
expect( ui.componentFactory ).to.be.instanceOf( ComponentFactory );
} );

it( 'creates #focusTracker', () => {
expect( ui.focusTracker ).to.be.instanceOf( FocusTracker );
it( 'extends EditorUI', () => {
expect( ui ).to.instanceof( EditorUI );
} );
} );

Expand Down Expand Up @@ -192,17 +178,6 @@ describe( 'ClassicEditorUI', () => {
} );
} );
} );

describe( 'destroy()', () => {
it( 'destroys the #view', () => {
const spy = sinon.spy( view, 'destroy' );

return editor.destroy()
.then( () => {
sinon.assert.calledOnce( spy );
} );
} );
} );
} );

function viewCreator( name ) {
Expand Down