ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove controller::joinRoom

Browse Source 
Remove controller::joinRoom in favour of using RoomManager::OpenResource
This commit is contained in:
James Graham
2023-11-25 15:07:15 +00:00
parent 704430db7a
commit 201aa82c04
8 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/ExploreComponent.qml
View File

@@ -26,7 +26,7 @@ RowLayout {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
Controller.joinRoom(roomId.length > 0 ? roomId : alias)
RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join")
}
})
}

2
src/qml/ExploreComponentMobile.qml
View File

@@ -57,7 +57,7 @@ ColumnLayout {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId));
} else {
Controller.joinRoom(roomId.length > 0 ? roomId : alias);
RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join");
}
})
exploreTabBar.currentIndex = -1;

2
src/qml/GlobalMenu.qml
View File

@@ -66,7 +66,7 @@ Labs.MenuBar {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
Controller.joinRoom(roomId)
RoomManager.openResource(roomId, "join")
}
})
}

2
src/qml/RoomListPage.qml
View File

@@ -191,7 +191,7 @@ Kirigami.Page {
if (isJoined) {
RoomManager.enterRoom(root.connection.room(roomId))
} else {
Controller.joinRoom(roomId)
RoomManager.openResource(roomId, "join")
}
})
}

2
src/qml/SpaceHierarchyDelegate.qml
View File

@@ -149,7 +149,7 @@ Item {
if (root.isJoined) {
root.enterRoom()
} else {
Controller.joinRoom(root.roomId)
RoomManager.openResource(root.roomId, "join")
}
}
}