Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
4 changes: 2 additions & 2 deletions app/apps/client/communication/websockets.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import { slashCommands, APIClient } from '../../../utils';
import { CachedCollectionManager } from '../../../ui-cached-collection';
Expand All @@ -16,7 +16,7 @@ export const AppEvents = Object.freeze({
COMMAND_REMOVED: 'command/removed',
});

export class AppWebsocketReceiver extends EventEmitter {
export class AppWebsocketReceiver extends Emitter {
constructor() {
super();

Expand Down
6 changes: 3 additions & 3 deletions app/ui-cached-collection/client/models/CachedCollection.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
import localforage from 'localforage';
import _ from 'underscore';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import { callbacks } from '../../../callbacks';
import Notifications from '../../../notifications/client/lib/Notifications';
Expand All @@ -28,7 +28,7 @@ const wrap = (fn) => (...args) => new Promise((resolve, reject) => {

const localforageGetItem = wrap(localforage.getItem);

class CachedCollectionManagerClass extends EventEmitter {
class CachedCollectionManagerClass extends Emitter {
constructor() {
super();
this.items = [];
Expand Down Expand Up @@ -118,7 +118,7 @@ const nullLog = function() {};

const log = (...args) => console.log(`CachedCollection ${ this.name } =>`, ...args);

export class CachedCollection extends EventEmitter {
export class CachedCollection extends Emitter {
constructor({
collection = new Mongo.Collection(null),
name,
Expand Down
4 changes: 2 additions & 2 deletions app/ui-message/client/ActionManager.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { UIKitInteractionType, UIKitIncomingInteractionType } from '@rocket.chat/apps-engine/definition/uikit';
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import Notifications from '../../notifications/client/lib/Notifications';
import { CachedCollectionManager } from '../../ui-cached-collection';
import { modal } from '../../ui-utils/client/lib/modal';
import { APIClient } from '../../utils';

const events = new EventEmitter();
const events = new Emitter();

export const on = (...args) => {
events.on(...args);
Expand Down
4 changes: 2 additions & 2 deletions app/ui-utils/client/lib/menu.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Session } from 'meteor/session';
import { Meteor } from 'meteor/meteor';
import _ from 'underscore';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import { isRtl } from '../../../utils';

const sideNavW = 280;
const map = (x, in_min, in_max, out_min, out_max) => (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;

export const menu = new class extends EventEmitter {
export const menu = new class extends Emitter {
constructor() {
super();
this._open = false;
Expand Down
4 changes: 2 additions & 2 deletions app/ui-utils/client/lib/readMessages.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import { RoomHistoryManager } from './RoomHistoryManager';
import { RoomManager } from './RoomManager';
Expand All @@ -18,7 +18,7 @@ import { ChatSubscription, ChatMessage } from '../../../models';
// window.addEventListener 'focus', ->
// readMessage.refreshUnreadMark(undefined, true)

export const readMessage = new class extends EventEmitter {
export const readMessage = new class extends Emitter {
constructor() {
super();
this.debug = false;
Expand Down
11 changes: 2 additions & 9 deletions app/ui/client/lib/menu.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
import _ from 'underscore';
import EventEmitter from 'wolfy87-eventemitter';

import { menu } from '../../../ui-utils';

const emitter = new EventEmitter();

window.addEventListener('resize', _.debounce((() => {
let lastState = window.matchMedia('(min-width: 780px)').matches ? 'mini' : 'large';
emitter.emit('grid', lastState);
menu.close();
return () => {
const futureState = window.matchMedia('(min-width: 780px)').matches ? 'mini' : 'large';
if (lastState !== futureState) {
lastState = futureState;
emitter.emit('grid', lastState);
menu.close();
}
};
})(), 100));

emitter.on('grid', () => {
menu.close();
});
4 changes: 2 additions & 2 deletions app/ui/client/lib/recorderjs/audioEncoder.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Meteor } from 'meteor/meteor';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';

import { settings } from '../../../../settings';

class AudioEncoder extends EventEmitter {
class AudioEncoder extends Emitter {
constructor(source, {
bufferLen = 4096,
numChannels = 1,
Expand Down
4 changes: 2 additions & 2 deletions app/webrtc/client/WebRTCClass.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter } from '@rocket.chat/emitter';
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { ReactiveVar } from 'meteor/reactive-var';
Expand All @@ -13,7 +13,7 @@ import { modal } from '../../ui-utils';
import { ChatSubscription } from '../../models';
import { WEB_RTC_EVENTS } from '..';

class WebRTCTransportClass extends EventEmitter {
class WebRTCTransportClass extends Emitter {
constructor(webrtcInstance) {
super();
this.debug = false;
Expand Down
6 changes: 3 additions & 3 deletions client/contexts/AuthorizationContext.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { createContext, useContext, useMemo, useCallback } from 'react';
import { useSubscription, Subscription, Unsubscribe } from 'use-subscription';
import EventEmitter from 'wolfy87-eventemitter';
import { Emitter, Handler } from '@rocket.chat/emitter';

import { IRole } from '../../definition/IUser';

type IRoles = { [_id: string]: IRole }


export class RoleStore extends EventEmitter {
export class RoleStore extends Emitter {
roles: IRoles = {};
}

Expand Down Expand Up @@ -91,7 +91,7 @@ export const useRolesDescription = (): (ids: Array<string>) => [string] => {
const subscription = useMemo(
() => ({
getCurrentValue: (): IRoles => roleStore.roles,
subscribe: (callback: Function): () => void => {
subscribe: (callback: Handler): () => void => {
roleStore.on('change', callback);
return (): void => {
roleStore.off('change', callback);
Expand Down
18 changes: 5 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
"@nivo/pie": "^0.61.1",
"@rocket.chat/apps-engine": "1.19.0-alpha.3984",
"@rocket.chat/css-in-js": "^0.17.0",
"@rocket.chat/emitter": "^0.17.0",
"@rocket.chat/fuselage": "^0.17.0",
"@rocket.chat/fuselage-hooks": "^0.17.0",
"@rocket.chat/fuselage-polyfills": "^0.17.0",
Expand All @@ -147,7 +148,6 @@
"@types/mkdirp": "^1.0.1",
"@types/underscore.string": "0.0.38",
"@types/use-subscription": "^1.0.0",
"@types/wolfy87-eventemitter": "^5.2.0",
"@types/xml-crypto": "^1.4.1",
"@types/xmldom": "^0.1.30",
"adm-zip": "RocketChat/adm-zip",
Expand Down Expand Up @@ -252,7 +252,6 @@
"use-subscription": "^1.4.1",
"uuid": "^3.4.0",
"webdav": "^2.10.2",
"wolfy87-eventemitter": "^5.2.9",
"xml-crypto": "^1.5.3",
"xml-encryption": "0.11.2",
"xml2js": "0.4.19",
Expand Down