mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into skindex-nextgen

Browse source
This commit is contained in:
David Baker 2015-12-01 18:10:04 +00:00
commit d7a00a5a86
5 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View file

@ -565,13 +565,13 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
var LeftPanel = sdk.getComponent('organisms.LeftPanel'); var LeftPanel = sdk.getComponent('structures.LeftPanel');
var RoomView = sdk.getComponent('structures.RoomView'); var RoomView = sdk.getComponent('structures.RoomView');
var RightPanel = sdk.getComponent('organisms.RightPanel'); var RightPanel = sdk.getComponent('structures.RightPanel');
var UserSettings = sdk.getComponent('structures.UserSettings'); var UserSettings = sdk.getComponent('structures.UserSettings');
var CreateRoom = sdk.getComponent('structures.CreateRoom'); var CreateRoom = sdk.getComponent('structures.CreateRoom');
var RoomDirectory = sdk.getComponent('organisms.RoomDirectory'); var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar'); var MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
// needs to be before normal PageTypes as you are logged in technically // needs to be before normal PageTypes as you are logged in technically
if (this.state.screen == 'post_registration') { if (this.state.screen == 'post_registration') {

4
src/components/structures/RoomView.js
View file

@ -513,7 +513,7 @@ module.exports = React.createClass({
}, },
getEventTiles: function() { getEventTiles: function() {
var DateSeparator = sdk.getComponent('molecules.DateSeparator'); var DateSeparator = sdk.getComponent('messages.DateSeparator');
var cli = MatrixClientPeg.get(); var cli = MatrixClientPeg.get();
var ret = []; var ret = [];
@ -833,7 +833,7 @@ module.exports = React.createClass({
var MessageComposer = sdk.getComponent('rooms.MessageComposer'); var MessageComposer = sdk.getComponent('rooms.MessageComposer');
var CallView = sdk.getComponent("voip.CallView"); var CallView = sdk.getComponent("voip.CallView");
var RoomSettings = sdk.getComponent("rooms.RoomSettings"); var RoomSettings = sdk.getComponent("rooms.RoomSettings");
var SearchBar = sdk.getComponent("molecules.SearchBar"); var SearchBar = sdk.getComponent("rooms.SearchBar");
if (!this.state.room) { if (!this.state.room) {
if (this.props.roomId) { if (this.props.roomId) {

4
src/components/views/rooms/EventTile.js
View file

@ -84,7 +84,7 @@ module.exports = React.createClass({
}, },
onEditClicked: function(e) { onEditClicked: function(e) {
var MessageContextMenu = sdk.getComponent('molecules.MessageContextMenu'); var MessageContextMenu = sdk.getComponent('rooms.MessageContextMenu');
var buttonRect = e.target.getBoundingClientRect() var buttonRect = e.target.getBoundingClientRect()
var x = buttonRect.right; var x = buttonRect.right;
var y = buttonRect.top + (e.target.height / 2); var y = buttonRect.top + (e.target.height / 2);
@ -223,7 +223,7 @@ module.exports = React.createClass({
render: function() { render: function() {
var MessageTimestamp = sdk.getComponent('messages.MessageTimestamp'); var MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
var SenderProfile = sdk.getComponent('molecules.SenderProfile'); var SenderProfile = sdk.getComponent('messages.SenderProfile');
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar'); var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
var content = this.props.mxEvent.getContent(); var content = this.props.mxEvent.getContent();

2
src/components/views/rooms/RoomList.js
View file

@ -226,7 +226,7 @@ module.exports = React.createClass({
<img className="mx_RoomList_expandButton" onClick={ this.onShowClick } src="img/menu.png" width="20" alt=">"/> : <img className="mx_RoomList_expandButton" onClick={ this.onShowClick } src="img/menu.png" width="20" alt=">"/> :
null; null;
var RoomSubList = sdk.getComponent('organisms.RoomSubList'); var RoomSubList = sdk.getComponent('structures.RoomSubList');
var self = this; var self = this;
return ( return (

13
src/components/views/rooms/RoomTile.js
View file

@ -60,17 +60,6 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
// if (this.props.clientOffset) {
// //console.log("room " + this.props.room.roomId + " has dropTarget clientOffset " + this.props.clientOffset.x + "," + this.props.clientOffset.y);
// }
/*
if (this.props.room._dragging) {
var RoomDropTarget = sdk.getComponent("molecules.RoomDropTarget");
return <RoomDropTarget placeholder={true}/>;
}
*/
var myUserId = MatrixClientPeg.get().credentials.userId; var myUserId = MatrixClientPeg.get().credentials.userId;
var me = this.props.room.currentState.members[myUserId]; var me = this.props.room.currentState.members[myUserId];
var classes = classNames({ var classes = classNames({
@ -117,7 +106,7 @@ module.exports = React.createClass({
label = <div className={ className }>{name}</div>; label = <div className={ className }>{name}</div>;
} }
else if (this.state.hover) { else if (this.state.hover) {
var RoomTooltip = sdk.getComponent("molecules.RoomTooltip"); var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
label = <RoomTooltip room={this.props.room}/>; label = <RoomTooltip room={this.props.room}/>;
} }