Skip to content

Commit 2a02520

Browse files
committed
Move remaining vector molecules to be components in vector (for now)
1 parent 8f5f71e commit 2a02520

File tree

13 files changed

+15
-53
lines changed

13 files changed

+15
-53
lines changed

src/skins/vector/views/molecules/BottomLeftMenu.js renamed to src/components/structures/BottomLeftMenu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ module.exports = React.createClass({
4040
return <div className="mx_RoomTile_name">{name}</div>
4141
}
4242
else if (this.state.hover) {
43-
var RoomTooltip = sdk.getComponent("molecules.RoomTooltip");
43+
var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
4444
return <RoomTooltip name={name}/>;
4545
}
4646
},
4747

4848
render: function() {
49-
var BottomLeftMenuTile = sdk.getComponent('molecules.BottomLeftMenuTile');
49+
var BottomLeftMenuTile = sdk.getComponent('rooms.BottomLeftMenuTile');
5050
return (
5151
<div className="mx_BottomLeftMenu">
5252
<div className="mx_BottomLeftMenu_options">
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/skins/vector/views/molecules/BottomLeftMenuTile.js renamed to src/components/views/rooms/BottomLeftMenuTile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = React.createClass({
4141
label = <div className="mx_RoomTile_name">{ this.props.label }</div>;
4242
}
4343
else if (this.state.hover) {
44-
var RoomTooltip = sdk.getComponent("molecules.RoomTooltip");
44+
var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
4545
label = <RoomTooltip bottom={ true } label={ this.props.label }/>;
4646
}
4747

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/skins/vector/skindex.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,16 @@ var skin = {};
2727
skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
2828
skin['elements.ImageView'] = require('../../components/views/elements/ImageView');
2929
skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
30+
skin['messages.DateSeparator'] = require('../../components/views/messages/DateSeparator');
31+
skin['messages.SenderProfile'] = require('../../components/views//messages/SenderProfile');
3032
skin['rooms.RoomTile'] = require('../../components/views/rooms/RoomDNDView');
33+
skin['rooms.BottomLeftMenuTile'] = require('../../components/views/rooms/BottomLeftMenuTile');
34+
skin['rooms.MessageContextMenu'] = require('../../components/views/rooms/MessageContextMenu');
35+
skin['rooms.RoomDropTarget'] = require('../../components/views/rooms/RoomDropTarget');
36+
skin['rooms.RoomTooltip'] = require('../../components/views/rooms/RoomTooltip');
37+
skin['rooms.SearchBar'] = require('../../components/views/rooms/SearchBar');
38+
skin['globals.MatrixToolbar'] = require('../../components/views/globals/MatrixToolbar');
39+
skin['structures.BottomLeftMenu'] = require('../../components/structures/BottomLeftMenu');
3140

3241

3342
// 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
7887
skin['structures.RoomView'] = require('matrix-react-sdk/lib/components/structures/RoomView');
7988
skin['structures.MatrixChat'] = require('matrix-react-sdk/lib/components/structures/MatrixChat');
8089

90+
8191
// Old style stuff - this stuff only exists in VECTOR
82-
skin['molecules.BottomLeftMenu'] = require('./views/molecules/BottomLeftMenu');
83-
skin['molecules.BottomLeftMenuTile'] = require('./views/molecules/BottomLeftMenuTile');
84-
skin['molecules.DateSeparator'] = require('./views/molecules/DateSeparator');
85-
skin['molecules.MatrixToolbar'] = require('./views/molecules/MatrixToolbar');
86-
skin['molecules.MessageContextMenu'] = require('./views/molecules/MessageContextMenu');
87-
skin['molecules.RoomCreate'] = require('./views/molecules/RoomCreate');
88-
skin['molecules.RoomDropTarget'] = require('./views/molecules/RoomDropTarget');
89-
skin['molecules.RoomTooltip'] = require('./views/molecules/RoomTooltip');
90-
skin['molecules.SearchBar'] = require('./views/molecules/SearchBar');
91-
skin['molecules.SenderProfile'] = require('./views/molecules/SenderProfile');
9292
skin['organisms.LeftPanel'] = require('./views/organisms/LeftPanel');
9393
skin['organisms.RightPanel'] = require('./views/organisms/RightPanel');
9494
skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory');

0 commit comments

Comments
 (0)