From 4dac9bc1b88cc5389b8bda11a94e7bcbce43ab95 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 2 Nov 2015 23:47:04 +0000 Subject: [PATCH 1/3] Use relative rather than absolute paths for icons --- vector/index.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vector/index.html b/vector/index.html index d893523ee3..d86466797d 100644 --- a/vector/index.html +++ b/vector/index.html @@ -4,26 +4,26 @@ Vector - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + From 942659df0dbe5754f53fe6084af4302d3ae0ff4f Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Nov 2015 14:15:57 +0000 Subject: [PATCH 2/3] Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load. --- src/skins/vector/views/molecules/RoomTile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/skins/vector/views/molecules/RoomTile.js b/src/skins/vector/views/molecules/RoomTile.js index 82616b5a59..ece4804321 100644 --- a/src/skins/vector/views/molecules/RoomTile.js +++ b/src/skins/vector/views/molecules/RoomTile.js @@ -56,7 +56,8 @@ module.exports = React.createClass({ name = this.props.room.getMember(MatrixClientPeg.get().credentials.userId).events.member.getSender(); } else { - name = this.props.room.name; + // XXX: We should never display raw room IDs, but sometimes the room name js sdk gives is undefined + name = this.props.room.name || this.props.room.roomId; } name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon From fdf79d709eacf1176be7a9ff87867dd0c1ae7b76 Mon Sep 17 00:00:00 2001 From: Steven Hammerton Date: Fri, 6 Nov 2015 11:22:59 +0000 Subject: [PATCH 3/3] Replace CAS login with token login --- src/vector/index.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index 298861973e..45d69001b3 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -65,14 +65,21 @@ function parseQsFromFragment(location) { return {}; } +function parseQs(location) { + return qs.parse(location.search.substring(1)); +} + // Here, we do some crude URL analysis to allow // deep-linking. We only support registration // deep-links in this example. function routeUrl(location) { - if (location.hash.indexOf('#/register') == 0) { + var params = parseQs(location); + var loginToken = params.loginToken; + if (loginToken) { + window.matrixChat.showScreen('token_login', parseQs(location)); + } + else if (location.hash.indexOf('#/register') == 0) { window.matrixChat.showScreen('register', parseQsFromFragment(location)); - } else if (location.hash.indexOf('#/login/cas') == 0) { - window.matrixChat.showScreen('cas_login', parseQsFromFragment(location)); } else { window.matrixChat.showScreen(location.hash.substring(2)); }