forked from matrix/element-web
Move remaining vector molecules to be components in vector (for now)
This commit is contained in:
parent
8f5f71ec80
commit
2a025201b1
|
@ -40,13 +40,13 @@ module.exports = React.createClass({
|
||||||
return <div className="mx_RoomTile_name">{name}</div>
|
return <div className="mx_RoomTile_name">{name}</div>
|
||||||
}
|
}
|
||||||
else if (this.state.hover) {
|
else if (this.state.hover) {
|
||||||
var RoomTooltip = sdk.getComponent("molecules.RoomTooltip");
|
var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
|
||||||
return <RoomTooltip name={name}/>;
|
return <RoomTooltip name={name}/>;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var BottomLeftMenuTile = sdk.getComponent('molecules.BottomLeftMenuTile');
|
var BottomLeftMenuTile = sdk.getComponent('rooms.BottomLeftMenuTile');
|
||||||
return (
|
return (
|
||||||
<div className="mx_BottomLeftMenu">
|
<div className="mx_BottomLeftMenu">
|
||||||
<div className="mx_BottomLeftMenu_options">
|
<div className="mx_BottomLeftMenu_options">
|
|
@ -41,7 +41,7 @@ module.exports = React.createClass({
|
||||||
label = <div className="mx_RoomTile_name">{ this.props.label }</div>;
|
label = <div className="mx_RoomTile_name">{ this.props.label }</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 bottom={ true } label={ this.props.label }/>;
|
label = <RoomTooltip bottom={ true } label={ this.props.label }/>;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,16 @@ var skin = {};
|
||||||
skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
|
skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
|
||||||
skin['elements.ImageView'] = require('../../components/views/elements/ImageView');
|
skin['elements.ImageView'] = require('../../components/views/elements/ImageView');
|
||||||
skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
|
skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
|
||||||
|
skin['messages.DateSeparator'] = require('../../components/views/messages/DateSeparator');
|
||||||
|
skin['messages.SenderProfile'] = require('../../components/views//messages/SenderProfile');
|
||||||
skin['rooms.RoomTile'] = require('../../components/views/rooms/RoomDNDView');
|
skin['rooms.RoomTile'] = require('../../components/views/rooms/RoomDNDView');
|
||||||
|
skin['rooms.BottomLeftMenuTile'] = require('../../components/views/rooms/BottomLeftMenuTile');
|
||||||
|
skin['rooms.MessageContextMenu'] = require('../../components/views/rooms/MessageContextMenu');
|
||||||
|
skin['rooms.RoomDropTarget'] = require('../../components/views/rooms/RoomDropTarget');
|
||||||
|
skin['rooms.RoomTooltip'] = require('../../components/views/rooms/RoomTooltip');
|
||||||
|
skin['rooms.SearchBar'] = require('../../components/views/rooms/SearchBar');
|
||||||
|
skin['globals.MatrixToolbar'] = require('../../components/views/globals/MatrixToolbar');
|
||||||
|
skin['structures.BottomLeftMenu'] = require('../../components/structures/BottomLeftMenu');
|
||||||
|
|
||||||
|
|
||||||
// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex?
|
// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex?
|
||||||
|
@ -78,17 +87,8 @@ skin['structures.UserSettings'] = require('matrix-react-sdk/lib/components/struc
|
||||||
skin['structures.RoomView'] = require('matrix-react-sdk/lib/components/structures/RoomView');
|
skin['structures.RoomView'] = require('matrix-react-sdk/lib/components/structures/RoomView');
|
||||||
skin['structures.MatrixChat'] = require('matrix-react-sdk/lib/components/structures/MatrixChat');
|
skin['structures.MatrixChat'] = require('matrix-react-sdk/lib/components/structures/MatrixChat');
|
||||||
|
|
||||||
|
|
||||||
// Old style stuff - this stuff only exists in VECTOR
|
// Old style stuff - this stuff only exists in VECTOR
|
||||||
skin['molecules.BottomLeftMenu'] = require('./views/molecules/BottomLeftMenu');
|
|
||||||
skin['molecules.BottomLeftMenuTile'] = require('./views/molecules/BottomLeftMenuTile');
|
|
||||||
skin['molecules.DateSeparator'] = require('./views/molecules/DateSeparator');
|
|
||||||
skin['molecules.MatrixToolbar'] = require('./views/molecules/MatrixToolbar');
|
|
||||||
skin['molecules.MessageContextMenu'] = require('./views/molecules/MessageContextMenu');
|
|
||||||
skin['molecules.RoomCreate'] = require('./views/molecules/RoomCreate');
|
|
||||||
skin['molecules.RoomDropTarget'] = require('./views/molecules/RoomDropTarget');
|
|
||||||
skin['molecules.RoomTooltip'] = require('./views/molecules/RoomTooltip');
|
|
||||||
skin['molecules.SearchBar'] = require('./views/molecules/SearchBar');
|
|
||||||
skin['molecules.SenderProfile'] = require('./views/molecules/SenderProfile');
|
|
||||||
skin['organisms.LeftPanel'] = require('./views/organisms/LeftPanel');
|
skin['organisms.LeftPanel'] = require('./views/organisms/LeftPanel');
|
||||||
skin['organisms.RightPanel'] = require('./views/organisms/RightPanel');
|
skin['organisms.RightPanel'] = require('./views/organisms/RightPanel');
|
||||||
skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory');
|
skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory');
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2015 OpenMarket Ltd
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
var React = require('react');
|
|
||||||
|
|
||||||
module.exports = React.createClass({
|
|
||||||
displayName: 'RoomCreate',
|
|
||||||
|
|
||||||
render: function() {
|
|
||||||
return (
|
|
||||||
<div className="mx_RoomCreate">
|
|
||||||
<div className="mx_RoomCreate_table">
|
|
||||||
<div className="mx_RoomTile">
|
|
||||||
<div className="mx_RoomTile_avatar">
|
|
||||||
<img src="img/create.png" width="32" height="32"/>
|
|
||||||
</div>
|
|
||||||
<div className="mx_RoomTile_name">Create new room</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
|
@ -86,7 +86,7 @@ var LeftPanel = React.createClass({
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var RoomList = sdk.getComponent('rooms.RoomList');
|
var RoomList = sdk.getComponent('rooms.RoomList');
|
||||||
var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu');
|
var BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
|
||||||
var IncomingCallBox = sdk.getComponent('voip.IncomingCallBox');
|
var IncomingCallBox = sdk.getComponent('voip.IncomingCallBox');
|
||||||
|
|
||||||
var collapseButton;
|
var collapseButton;
|
||||||
|
|
|
@ -235,7 +235,7 @@ var RoomSubList = React.createClass({
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var connectDropTarget = this.props.connectDropTarget;
|
var connectDropTarget = this.props.connectDropTarget;
|
||||||
var RoomDropTarget = sdk.getComponent('molecules.RoomDropTarget');
|
var RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
|
||||||
|
|
||||||
var label = this.props.collapsed ? null : this.props.label;
|
var label = this.props.collapsed ? null : this.props.label;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue