imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into kegan/delete-empty-files

Browse source 
Conflicts:
	src/skins/vector/views/molecules/EventAsTextTile.js
This commit is contained in:
Kegan Dougal 2015-10-27 09:19:08 +00:00
commit c91b642a8b
23 changed files with 353 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/skins/vector/views/pages/MatrixChat.js
View file

@ -26,7 +26,6 @@ var Loader = require("react-loader");
var dis = require('matrix-react-sdk/lib/dispatcher');
module.exports = React.createClass({
displayName: 'MatrixChat',
mixins: [MatrixChatController],
@ -40,6 +39,23 @@ module.exports = React.createClass({
componentDidMount: function() {
window.addEventListener('resize', this.handleResize);
this.handleResize();
matrixLinkify.onUserClick = function(e, userId) {
// this can really go anywhere..
// sprout a MemberInfo context menu.
console.log("Context => %s => %s", userId, e.target);
var MemberInfo = sdk.getComponent('molecules.MemberInfo');
var member = new RoomMember(null, href);
ContextualMenu.createMenu(MemberInfo, {
member: member,
right: window.innerWidth - e.pageX,
top: e.pageY,
onFinished: function() {
console.log("^_^ All done!");
}
});
};
},
componentWillUnmount: function() {