Skip to content

Commit 2195880

Browse files
ppisljarmattkime
authored andcommitted
removes usage of EventsProvider in vislib (#38533)
* removing EventsProvider usage in Vislib
1 parent c2ef2c8 commit 2195880

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

src/legacy/ui/public/vislib/__tests__/lib/axis/axis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Vislib Axis Class Test Suite', function () {
101101
};
102102

103103
beforeEach(ngMock.module('kibana'));
104-
beforeEach(ngMock.inject(function (Private, $injector) {
104+
beforeEach(ngMock.inject(function ($injector) {
105105
persistedState = new ($injector.get('PersistedState'))();
106106

107107
el = d3.select('body').append('div')

src/legacy/ui/public/vislib/__tests__/lib/x_axis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ describe('Vislib xAxis Class Test Suite', function () {
106106
};
107107

108108
beforeEach(ngMock.module('kibana'));
109-
beforeEach(ngMock.inject(function (Private, $injector) {
109+
beforeEach(ngMock.inject(function ($injector) {
110110
persistedState = new ($injector.get('PersistedState'))();
111111

112112
el = d3.select('body').append('div')

src/legacy/ui/public/vislib/__tests__/lib/y_axis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function createData(seriesData) {
110110
describe('Vislib yAxis Class Test Suite', function () {
111111
beforeEach(ngMock.module('kibana'));
112112

113-
beforeEach(ngMock.inject(function (Private, $injector) {
113+
beforeEach(ngMock.inject(function ($injector) {
114114
persistedState = new ($injector.get('PersistedState'))();
115115

116116
expect($('.y-axis-wrapper')).to.have.length(0);

src/legacy/ui/public/vislib/__tests__/vis.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ dataArray.forEach(function (data, i) {
162162
});
163163

164164
afterEach(function () {
165-
vis.off(beforeEvent);
166-
vis.off(afterEvent);
165+
vis.removeAllListeners(beforeEvent);
166+
vis.removeAllListeners(afterEvent);
167167
});
168168

169169
it('should add an event and its listeners', function () {
@@ -219,8 +219,8 @@ dataArray.forEach(function (data, i) {
219219
});
220220

221221
afterEach(function () {
222-
vis.off(beforeEvent);
223-
vis.off(afterEvent);
222+
vis.removeAllListeners(beforeEvent);
223+
vis.removeAllListeners(afterEvent);
224224
});
225225

226226
it('should remove a listener', function () {
@@ -241,7 +241,7 @@ dataArray.forEach(function (data, i) {
241241

242242
it('should remove the event and all listeners when only event passed an argument', function () {
243243
const charts = vis.handler.charts;
244-
vis.off(afterEvent);
244+
vis.removeAllListeners(afterEvent);
245245

246246
// should remove 'brush' event
247247
expect(vis.listeners(beforeEvent)).to.contain(listener2);

src/legacy/ui/public/vislib/lib/handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export class Handler {
156156
chartSelection.each(function (chartData) {
157157
const chart = new self.ChartClass(self, this, chartData);
158158

159-
self.vis.activeEvents().forEach(function (event) {
159+
self.vis.eventNames().forEach(function (event) {
160160
self.enable(event, chart);
161161
});
162162

src/legacy/ui/public/vislib/vis.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919

2020
import _ from 'lodash';
2121
import d3 from 'd3';
22+
import { EventEmitter } from 'events';
23+
import chrome from '../chrome';
2224
import { KbnError } from '../errors';
23-
import { EventsProvider } from '../events';
2425
import { VisConfig } from './lib/vis_config';
2526
import { Handler } from './lib/handler';
2627
import { setHierarchicalTooltipFormatter } from '../vis/components/tooltip/_hierarchical_tooltip_formatter';
2728
import { setPointSeriesTooltipFormatter } from '../vis/components/tooltip/_pointseries_tooltip_formatter';
2829

29-
export function VislibVisProvider(Private, config) {
30-
const Events = Private(EventsProvider);
30+
const config = chrome.getUiSettingsClient();
31+
32+
export function VislibVisProvider(Private) {
3133

3234
setHierarchicalTooltipFormatter(Private);
3335
setPointSeriesTooltipFormatter(Private);
@@ -40,9 +42,9 @@ export function VislibVisProvider(Private, config) {
4042
* @param $el {HTMLElement} jQuery selected HTML element
4143
* @param config {Object} Parameters that define the chart type and chart options
4244
*/
43-
class Vis extends Events {
45+
class Vis extends EventEmitter {
4446
constructor($el, visConfigArgs) {
45-
super(arguments);
47+
super();
4648
this.el = $el.get ? $el.get(0) : $el;
4749
this.visConfigArgs = _.cloneDeep(visConfigArgs);
4850
this.visConfigArgs.dimmingOpacity = config.get('visualization:dimmingOpacity');
@@ -153,7 +155,7 @@ export function VislibVisProvider(Private, config) {
153155
*/
154156
on(event, listener) {
155157
const first = this.listenerCount(event) === 0;
156-
const ret = Events.prototype.on.call(this, event, listener);
158+
const ret = EventEmitter.prototype.on.call(this, event, listener);
157159
const added = this.listenerCount(event) > 0;
158160

159161
// if this is the first listener added for the event
@@ -172,13 +174,19 @@ export function VislibVisProvider(Private, config) {
172174
*/
173175
off(event, listener) {
174176
const last = this.listenerCount(event) === 1;
175-
const ret = Events.prototype.off.call(this, event, listener);
177+
const ret = EventEmitter.prototype.off.call(this, event, listener);
176178
const removed = this.listenerCount(event) === 0;
177179

178180
// Once all listeners are removed, disable the events in the handler
179181
if (last && removed && this.handler) this.handler.disable(event);
180182
return ret;
181183
}
184+
185+
removeAllListeners(event) {
186+
const ret = EventEmitter.prototype.removeAllListeners.call(this, event);
187+
this.handler.disable(event);
188+
return ret;
189+
}
182190
}
183191

184192
return Vis;

0 commit comments

Comments
 (0)