Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Element Web
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Element (formerly New Vector)
Element Web
Commits
e8d5e8c8
Commit
e8d5e8c8
authored
Feb 17, 2017
by
David Baker
Committed by
GitHub
Feb 17, 2017
Browse files
Options
Downloads
Plain Diff
Merge pull request #3246 from vector-im/dbkr/allow_forget_ban
Allow forgetting rooms you're banned from
parents
0d1c5328
6aa52660
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/views/context_menus/RoomTagContextMenu.js
+10
-8
10 additions, 8 deletions
src/components/views/context_menus/RoomTagContextMenu.js
with
10 additions
and
8 deletions
src/components/views/context_menus/RoomTagContextMenu.js
+
10
−
8
View file @
e8d5e8c8
...
...
@@ -16,13 +16,15 @@ limitations under the License.
'
use strict
'
;
var
q
=
require
(
"
q
"
);
var
React
=
require
(
'
react
'
);
var
classNames
=
require
(
'
classnames
'
);
var
MatrixClientPeg
=
require
(
'
matrix-react-sdk/lib/MatrixClientPeg
'
);
var
dis
=
require
(
'
matrix-react-sdk/lib/dispatcher
'
);
var
DMRoomMap
=
require
(
'
matrix-react-sdk/lib/utils/DMRoomMap
'
);
var
Rooms
=
require
(
'
matrix-react-sdk/lib/Rooms
'
);
import
q
from
'
q
'
;
import
React
from
'
react
'
;
import
classNames
from
'
classnames
'
;
import
sdk
from
'
matrix-react-sdk
'
;
import
MatrixClientPeg
from
'
matrix-react-sdk/lib/MatrixClientPeg
'
;
import
dis
from
'
matrix-react-sdk/lib/dispatcher
'
;
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
({
displayName
:
'
RoomTagContextMenu
'
,
...
...
@@ -214,7 +216,7 @@ module.exports = React.createClass({
'
mx_RoomTagContextMenu_fieldDisabled
'
:
false
,
});
if
(
myMember
&&
myMember
.
membership
===
"
leave
"
)
{
if
(
myMember
&&
(
myMember
.
membership
===
"
leave
"
||
myMember
.
membership
===
"
ban
"
)
)
{
return
(
<
div
>
<
div
className
=
{
leaveClasses
}
onClick
=
{
this
.
_onClickForget
}
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment