matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-21 07:42:09 +03:00
Code Activity

Merge branch 'develop' into travis/granular-settings

Browse Source
This commit is contained in:
Travis Ralston
2017-11-07 14:55:12 -07:00
committed by GitHub
parent 781b94c8f4 8fbe50a1cf
commit 289b0c2b6a
24 changed files with 419 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/RoomView.js
View File

@ -301,6 +301,15 @@ module.exports = React.createClass({
_shouldShowApps: function(room) {
if (!BROWSER_SUPPORTS_SANDBOX) return false;
// Check if user has previously chosen to hide the app drawer for this
// room. If so, do not show apps
let hideWidgetDrawer = localStorage.getItem(
room.roomId + "_hide_widget_drawer");
if (hideWidgetDrawer === "true") {
return false;
}
const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
// any valid widget = show apps
for (let i = 0; i < appsStateEvents.length; i++) {