matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge pull request #314 from matrix-org/dbkr/show_canonical_alias

Browse Source 
Show canonical alias in URL bar
This commit is contained in:
Richard van der Hoff
2016-06-17 17:03:18 +01:00
committed by GitHub
parent aa67e33744 6adce649eb
commit 1d42443c0c
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View File

@@ -539,7 +539,7 @@ module.exports = React.createClass({
var presentedId = roomAlias || roomId;
var room = MatrixClientPeg.get().getRoom(roomId);
if (room) {
var theAlias = MatrixTools.getCanonicalAliasForRoom(room);
var theAlias = MatrixTools.getDisplayAliasForRoom(room);
if (theAlias) presentedId = theAlias;
// No need to do this given RoomView triggers it itself...
@@ -631,7 +631,7 @@ module.exports = React.createClass({
var presentedId = self.state.currentRoomId;
var room = MatrixClientPeg.get().getRoom(self.state.currentRoomId);
if (room) {
var theAlias = MatrixTools.getCanonicalAliasForRoom(room);
var theAlias = MatrixTools.getDisplayAliasForRoom(room);
if (theAlias) presentedId = theAlias;
}