PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge the two different widget utils files

Browse source
This commit is contained in:
David Baker 2018-06-26 11:52:21 +01:00
parent 069080e7ed
commit 0f2c47937c
5 changed files with 85 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ScalarMessaging.js
View file

@ -236,7 +236,6 @@ import SdkConfig from './SdkConfig';
import MatrixClientPeg from './MatrixClientPeg';
import { MatrixEvent } from 'matrix-js-sdk';
import dis from './dispatcher';
import Widgets from './utils/widgets';
import WidgetUtils from './WidgetUtils';
import RoomViewStore from './stores/RoomViewStore';
import { _t } from './languageHandler';
@ -375,7 +374,7 @@ function getWidgets(event, roomId) {
}
// Add user widgets (not linked to a specific room)
const userWidgets = Widgets.getUserWidgetsArray();
const userWidgets = WidgetUtils.getUserWidgetsArray();
widgetStateEvents = widgetStateEvents.concat(userWidgets);
sendResponse(event, widgetStateEvents);