OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow forgetting rooms you're banned from 

From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
pull/3246/head
David Baker 2017-02-17 15:52:07 +00:00
parent 75097471b6
commit 03dd25624f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/context_menus/RoomTagContextMenu.js
View File

@ -16,13 +16,15 @@ limitations under the License.
'use strict'; 'use strict';
var q = require("q"); import q from 'q';
var React = require('react'); import React from 'react';
var classNames = require('classnames'); import classNames from 'classnames';
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); import sdk from 'matrix-react-sdk';
var dis = require('matrix-react-sdk/lib/dispatcher'); import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
var DMRoomMap = require('matrix-react-sdk/lib/utils/DMRoomMap'); import dis from 'matrix-react-sdk/lib/dispatcher';
var Rooms = require('matrix-react-sdk/lib/Rooms'); import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
import Rooms from 'matrix-react-sdk/lib/Rooms';
import Modal from 'matrix-react-sdk/lib/Modal';
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'RoomTagContextMenu', displayName: 'RoomTagContextMenu',
@ -214,7 +216,7 @@ module.exports = React.createClass({
'mx_RoomTagContextMenu_fieldDisabled': false, 'mx_RoomTagContextMenu_fieldDisabled': false,
}); });
if (myMember && myMember.membership === "leave") { if (myMember && (myMember.membership === "leave" || myMember.membership === "ban")) {
return ( return (
<div> <div>
<div className={ leaveClasses } onClick={ this._onClickForget } > <div className={ leaveClasses } onClick={ this._onClickForget } >