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

Commit

Permalink
Merge b37b130 into 389b72e
Browse files Browse the repository at this point in the history
  • Loading branch information
scofalik committed Jun 28, 2019
2 parents 389b72e + b37b130 commit 511683d
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 2 deletions.
44 changes: 44 additions & 0 deletions src/view/observer/inputobserver.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/**
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

/**
* @module engine/view/observer/inputobserver
*/

import DomEventObserver from './domeventobserver';

/**
* Observer for events connected with data input.
*
* Note that this observer is attached by the {@link module:engine/view/view~View} and is available by default.
*
* @extends module:engine/view/observer/domeventobserver~DomEventObserver
*/
export default class InputObserver extends DomEventObserver {
constructor( view ) {
super( view );

this.domEventType = [ 'beforeinput' ];
}

onDomEvent( domEvent ) {
this.fire( domEvent.type, domEvent );
}
}

/**
* Fired before browser inputs (or deletes) some data.
*
* This event is available only on browsers which support DOM `beforeinput` event.
*
* Introduced by {@link module:engine/view/observer/inputobserver~InputObserver}.
*
* Note that because {@link module:engine/view/observer/inputobserver~InputObserver} is attached by the
* {@link module:engine/view/view~View} this event is available by default.
*
* @see module:engine/view/observer/inputobserver~InputObserver
* @event module:engine/view/document~Document#event:beforeinput
* @param {module:engine/view/observer/domeventdata~DomEventData} data Event data.
*/
2 changes: 1 addition & 1 deletion src/view/observer/keyobserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import DomEventObserver from './domeventobserver';
import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';

/**
* {@link module:engine/view/document~Document#event:keydown Key down} event observer.
* Observer for events connected with pressing keyboard keys.
*
* Note that this observer is attached by the {@link module:engine/view/view~View} and is available by default.
*
Expand Down
2 changes: 2 additions & 0 deletions src/view/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import FakeSelectionObserver from './observer/fakeselectionobserver';
import SelectionObserver from './observer/selectionobserver';
import FocusObserver from './observer/focusobserver';
import CompositionObserver from './observer/compositionobserver';
import InputObserver from './observer/inputobserver';

import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
import log from '@ckeditor/ckeditor5-utils/src/log';
Expand Down Expand Up @@ -172,6 +173,7 @@ export default class View {
this.addObserver( KeyObserver );
this.addObserver( FakeSelectionObserver );
this.addObserver( CompositionObserver );
this.addObserver( InputObserver );

// Inject quirks handlers.
injectQuirksHandling( this );
Expand Down
40 changes: 40 additions & 0 deletions tests/view/observer/inputobserver.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

import InputObserver from '../../../src/view/observer/inputobserver';
import View from '../../../src/view/view';

describe( 'InputObserver', () => {
let view, viewDocument, observer;

beforeEach( () => {
view = new View();
viewDocument = view.document;
observer = view.getObserver( InputObserver );
} );

afterEach( () => {
view.destroy();
} );

it( 'should define domEventType', () => {
expect( observer.domEventType ).to.contains( 'beforeinput' );
} );

it( 'should fire beforeinput with dom event data', () => {
const spy = sinon.spy();

viewDocument.on( 'beforeinput', spy );

const domEvtData = {
type: 'beforeinput'
};

observer.onDomEvent( domEvtData );

expect( spy.calledOnce ).to.be.true;
expect( spy.args[ 0 ][ 1 ].domEvent ).to.equal( domEvtData );
} );
} );
4 changes: 3 additions & 1 deletion tests/view/view/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import View from '../../../src/view/view';
import Observer from '../../../src/view/observer/observer';
import MutationObserver from '../../../src/view/observer/mutationobserver';
import KeyObserver from '../../../src/view/observer/keyobserver';
import InputObserver from '../../../src/view/observer/inputobserver';
import FakeSelectionObserver from '../../../src/view/observer/fakeselectionobserver';
import SelectionObserver from '../../../src/view/observer/selectionobserver';
import FocusObserver from '../../../src/view/observer/focusobserver';
Expand All @@ -28,7 +29,7 @@ import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';

describe( 'view', () => {
const DEFAULT_OBSERVERS_COUNT = 6;
const DEFAULT_OBSERVERS_COUNT = 7;
let domRoot, view, viewDocument, ObserverMock, instantiated, enabled, ObserverMockGlobalCount;

testUtils.createSinonSandbox();
Expand Down Expand Up @@ -85,6 +86,7 @@ describe( 'view', () => {
expect( view.getObserver( KeyObserver ) ).to.be.instanceof( KeyObserver );
expect( view.getObserver( FakeSelectionObserver ) ).to.be.instanceof( FakeSelectionObserver );
expect( view.getObserver( CompositionObserver ) ).to.be.instanceof( CompositionObserver );
expect( view.getObserver( InputObserver ) ).to.be.instanceof( InputObserver );
} );

describe( 'attachDomRoot()', () => {
Expand Down

0 comments on commit 511683d

Please sign in to comment.