Merge the Leave and Forget room popups
This commit is contained in:
@@ -25,11 +25,13 @@ Banner {
|
||||
buttonCallbacks: ({
|
||||
forget: button => {
|
||||
window.makePopup(
|
||||
"Popups/ForgetRoomPopup.qml",
|
||||
"Popups/LeaveRoomPopup.qml",
|
||||
{
|
||||
userId: chat.userId,
|
||||
roomId: chat.roomId,
|
||||
roomName: chat.roomInfo.display_name,
|
||||
userId: chat.userId,
|
||||
roomId: chat.roomId,
|
||||
roomName: chat.roomInfo.display_name,
|
||||
inviterId: chat.roomInfo.inviter_id,
|
||||
left: true,
|
||||
},
|
||||
obj => {
|
||||
obj.onOk.connect(() => { button.loading = true }) // FIXME
|
||||
|
@@ -59,19 +59,11 @@ Item {
|
||||
roomId,
|
||||
roomName: roomInfo.display_name,
|
||||
inviterId: roomInfo.inviter_id,
|
||||
left: roomInfo.left,
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
HShortcut {
|
||||
sequences: window.settings.Keys.Chat.forget
|
||||
active: userInfo && userInfo.presence !== "offline"
|
||||
onActivated: window.makePopup(
|
||||
"Popups/ForgetRoomPopup.qml",
|
||||
{userId, roomId, roomName: roomInfo.display_name},
|
||||
)
|
||||
}
|
||||
|
||||
Timer {
|
||||
interval: 300
|
||||
running: ! ready
|
||||
|
Reference in New Issue
Block a user