From 93d81d27ba408dec8bb0a992be1df6db91e41d46 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:32:40 +0100 Subject: [PATCH 1/8] fix memberDict reference --- src/skins/vector/views/organisms/MemberList.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index 1cf0bf276e..1fd8c4d207 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -35,9 +35,13 @@ module.exports = React.createClass({ makeMemberTiles: function() { var MemberTile = sdk.getComponent("molecules.MemberTile"); + if (!self.memberDict) { + return null; + } + var self = this; - return Object.keys(self.state.memberDict).map(function(userId) { - var m = self.state.memberDict[userId]; + return Object.keys(self.memberDict).map(function(userId) { + var m = self.memberDict[userId]; return ( ); From 209889210b86bcd6b610657f13fe17c5e8db7251 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:36:10 +0100 Subject: [PATCH 2/8] Remove unnececessary and wrong null check --- src/skins/vector/views/organisms/MemberList.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index 1fd8c4d207..f45d215d95 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -35,10 +35,6 @@ module.exports = React.createClass({ makeMemberTiles: function() { var MemberTile = sdk.getComponent("molecules.MemberTile"); - if (!self.memberDict) { - return null; - } - var self = this; return Object.keys(self.memberDict).map(function(userId) { var m = self.memberDict[userId]; From 044c75270fe51e6fdb37521d5e4bbd68f04deb98 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:41:16 +0100 Subject: [PATCH 3/8] This has changed in newer react sdk but in master, it should be state.memberDict --- src/skins/vector/views/organisms/MemberList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index f45d215d95..1cf0bf276e 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -36,8 +36,8 @@ module.exports = React.createClass({ var MemberTile = sdk.getComponent("molecules.MemberTile"); var self = this; - return Object.keys(self.memberDict).map(function(userId) { - var m = self.memberDict[userId]; + return Object.keys(self.state.memberDict).map(function(userId) { + var m = self.state.memberDict[userId]; return ( ); From cee37c4152a7f1da0e059ec74c6a6826fdbd5558 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 28 Oct 2015 15:16:13 +0000 Subject: [PATCH 4/8] Port react-sdk 2365fe8c over to vector's fork of the roomlist controller --- src/controllers/organisms/RoomList.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js index 03a1bfcd18..151a6ca278 100644 --- a/src/controllers/organisms/RoomList.js +++ b/src/controllers/organisms/RoomList.js @@ -34,6 +34,7 @@ module.exports = { cli.on("Room.timeline", this.onRoomTimeline); cli.on("Room.name", this.onRoomName); cli.on("RoomState.events", this.onRoomStateEvents); + cli.on("RoomMember.name", this.onRoomMemberName); var rooms = this.getRoomList(); this.setState({ @@ -116,6 +117,10 @@ module.exports = { setTimeout(this.refreshRoomList, 0); }, + onRoomMemberName: function(ev, member) { + setTimeout(this.refreshRoomList, 0); + }, + refreshRoomList: function() { var rooms = this.getRoomList(); From 4118c05d15269d542f31c72973d29cf047ed3dba Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 28 Oct 2015 16:23:48 +0000 Subject: [PATCH 5/8] Unused variables --- src/skins/vector/views/atoms/RoomAvatar.js | 1 - src/skins/vector/views/molecules/EventAsTextTile.js | 1 - src/skins/vector/views/molecules/EventTile.js | 2 -- src/skins/vector/views/molecules/MessageTile.js | 2 -- src/skins/vector/views/molecules/RoomHeader.js | 2 +- 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/skins/vector/views/atoms/RoomAvatar.js b/src/skins/vector/views/atoms/RoomAvatar.js index e57b3b7ae5..3b5d463498 100644 --- a/src/skins/vector/views/atoms/RoomAvatar.js +++ b/src/skins/vector/views/atoms/RoomAvatar.js @@ -17,7 +17,6 @@ limitations under the License. 'use strict'; var React = require('react'); -var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var RoomAvatarController = require('matrix-react-sdk/lib/controllers/atoms/RoomAvatar') diff --git a/src/skins/vector/views/molecules/EventAsTextTile.js b/src/skins/vector/views/molecules/EventAsTextTile.js index db9df9f49b..ec644a4ec4 100644 --- a/src/skins/vector/views/molecules/EventAsTextTile.js +++ b/src/skins/vector/views/molecules/EventAsTextTile.js @@ -18,7 +18,6 @@ limitations under the License. var React = require('react'); -var sdk = require('matrix-react-sdk') var TextForEvent = require('matrix-react-sdk/lib/TextForEvent'); module.exports = React.createClass({ diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js index 1b1642bde4..389b8b4012 100644 --- a/src/skins/vector/views/molecules/EventTile.js +++ b/src/skins/vector/views/molecules/EventTile.js @@ -69,8 +69,6 @@ module.exports = React.createClass({ var SenderProfile = sdk.getComponent('molecules.SenderProfile'); var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); - var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile'); - var content = this.props.mxEvent.getContent(); var msgtype = content.msgtype; diff --git a/src/skins/vector/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js index 44f5b63564..f30fee92d1 100644 --- a/src/skins/vector/views/molecules/MessageTile.js +++ b/src/skins/vector/views/molecules/MessageTile.js @@ -17,12 +17,10 @@ limitations under the License. 'use strict'; var React = require('react'); -var classNames = require("classnames"); var sdk = require('matrix-react-sdk') var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile') -var ContextualMenu = require('../../../../ContextualMenu'); module.exports = React.createClass({ displayName: 'MessageTile', diff --git a/src/skins/vector/views/molecules/RoomHeader.js b/src/skins/vector/views/molecules/RoomHeader.js index 94adb2a9f4..d3f9119aef 100644 --- a/src/skins/vector/views/molecules/RoomHeader.js +++ b/src/skins/vector/views/molecules/RoomHeader.js @@ -61,7 +61,7 @@ module.exports = React.createClass({ var call_buttons; var zoom_button; if (this.state && this.state.call_state != 'ended') { - var muteVideoButton; + //var muteVideoButton; var activeCall = ( CallHandler.getCallForRoom(this.props.room.roomId) ); From e48e636c44b4774fe6e7e3bef1062654e07512bb Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 28 Oct 2015 18:27:09 +0000 Subject: [PATCH 6/8] Bump js-sdk & react-sdk deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 275ef4c293..02f793a197 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "filesize": "^3.1.2", "flux": "~2.0.3", "linkifyjs": "^2.0.0-beta.4", - "matrix-js-sdk": "^0.2.2", - "matrix-react-sdk": "^0.0.1", + "matrix-js-sdk": "^0.3.0", + "matrix-react-sdk": "^0.0.2", "q": "^1.4.1", "react": "^0.13.3", "react-loader": "^1.4.0" From 5c77395faabf0fc70d3d5b7111a72e335981646c Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 28 Oct 2015 18:32:13 +0000 Subject: [PATCH 7/8] v0.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02f793a197..cab45e836d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.0.1", + "version": "0.1.2", "description": "Vector webapp", "author": "matrix.org", "repository": { From 3db86b1f591e7d6206fe9463d403c0e41d29dd49 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 28 Oct 2015 18:37:53 +0000 Subject: [PATCH 8/8] changelog --- CHANGES.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4d04dbadeb..d15c9d8ed8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,14 @@ +Changes in vector v0.1.2 (2015-10-28) +====================================== + * Support Room Avatars + * Fullscreen video calls + * Mute mic in VoIP calls + * Fix bug with multiple desktop notifications + * Context menu on messages + * Better hover-over on member list + * Support CAS auth + * Many other bug fixes + Changes in vector v0.1.1 (2015-08-10) ======================================