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

fix previous commit to allow deep-linking to specific pages better

pull/21833/head
Matthew Hodgson 2015-11-11 02:32:16 +01:00
parent 6ad210cde3
commit a082a24f9a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/pages/MatrixChat.js
View File

@ -316,7 +316,7 @@ module.exports = {
room_alias: self.starting_room_alias
});
delete self.starting_room_alias;
} else {
} else if (!self.state.page_type) {
if (!self.state.currentRoom) {
var firstRoom = null;
if (cli.getRooms() && cli.getRooms().length) {
@ -339,8 +339,10 @@ module.exports = {
var theAlias = MatrixTools.getCanonicalAliasForRoom(room);
if (theAlias) presentedId = theAlias;
}
self.notifyNewScreen('room/'+presentedId, true);
self.notifyNewScreen('room/'+presentedId);
dis.dispatch({action: 'focus_composer'});
} else {
self.setState({ready: true});
}
});
cli.on('Call.incoming', function(call) {
@ -439,9 +441,9 @@ module.exports = {
}
},
notifyNewScreen: function(screen, onlyIfBlank) {
notifyNewScreen: function(screen) {
if (this.props.onNewScreen) {
this.props.onNewScreen(screen, onlyIfBlank);
this.props.onNewScreen(screen);
}
}
};