Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 4 deletions src/core/events-strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { EventEmitter, NgZone } from '@angular/core';
import { DxComponent } from './component';

const dxToNgEventNames = {};
const nullEmitter = new EventEmitter<any>();

interface EventSubscriber {
handler: any;
Expand All @@ -15,8 +14,7 @@ export class NgEventsStrategy {
constructor(private ngZone: NgZone, private component: DxComponent) { }

hasEvent(name: string) {
let emitter = this.getEmitter(name);
return emitter !== nullEmitter && emitter.observers.length;
return this.getEmitter(name).observers.length;
}

fireEvent(name, args) {
Expand Down Expand Up @@ -44,7 +42,11 @@ export class NgEventsStrategy {
dispose() {}

private getEmitter(eventName: string): EventEmitter<any> {
return this.component[dxToNgEventNames[eventName]] || nullEmitter;
let ngEventName = dxToNgEventNames[eventName];
if (!this.component[ngEventName]) {
this.component[ngEventName] = new EventEmitter();
}
return this.component[ngEventName];
}
}

Expand Down
18 changes: 18 additions & 0 deletions tests/src/core/component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,22 @@ describe('DevExtreme Angular 2 widget', () => {
instance.option('testOption', 'new value');
}));

it('should fire unknown subscribed events', async(() => {
TestBed.overrideComponent(TestContainerComponent, {
set: {
template: '<dx-test-widget></dx-test-widget>'
}
});

let fixture = TestBed.createComponent(TestContainerComponent);
fixture.detectChanges();

let instance = getWidget(fixture);

instance.on('unknownEvent', function() {
expect(this).toBe(instance);
});
instance.fireEvent('unknownEvent');
}));

});