From 8083e7f118559cc3b23f3b0241e70f261866431c Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 1 Dec 2015 15:45:38 +0000 Subject: [PATCH] Move vector-only components to src/components. --- .../structures}/CompatibilityPage.js | 0 .../structures}/LeftPanel.js | 2 +- .../structures}/RightPanel.js | 0 .../structures}/RoomDirectory.js | 0 .../structures}/RoomSubList.js | 0 .../structures}/ViewSource.js | 0 src/components/views/rooms/MessageContextMenu.js | 2 +- src/skins/vector/skindex.js | 16 ++++++---------- src/vector/index.js | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) rename src/{skins/vector/views/pages => components/structures}/CompatibilityPage.js (100%) rename src/{skins/vector/views/organisms => components/structures}/LeftPanel.js (98%) rename src/{skins/vector/views/organisms => components/structures}/RightPanel.js (100%) rename src/{skins/vector/views/organisms => components/structures}/RoomDirectory.js (100%) rename src/{skins/vector/views/organisms => components/structures}/RoomSubList.js (100%) rename src/{skins/vector/views/organisms => components/structures}/ViewSource.js (100%) diff --git a/src/skins/vector/views/pages/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js similarity index 100% rename from src/skins/vector/views/pages/CompatibilityPage.js rename to src/components/structures/CompatibilityPage.js diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/components/structures/LeftPanel.js similarity index 98% rename from src/skins/vector/views/organisms/LeftPanel.js rename to src/components/structures/LeftPanel.js index baa91e9fd8..aaab8084d4 100644 --- a/src/skins/vector/views/organisms/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -22,7 +22,7 @@ var HTML5Backend = require('react-dnd-html5-backend'); var sdk = require('matrix-react-sdk') var dis = require('matrix-react-sdk/lib/dispatcher'); -var VectorConferenceHandler = require('../../../../VectorConferenceHandler'); +var VectorConferenceHandler = require('../../VectorConferenceHandler'); var CallHandler = require("matrix-react-sdk/lib/CallHandler"); var LeftPanel = React.createClass({ diff --git a/src/skins/vector/views/organisms/RightPanel.js b/src/components/structures/RightPanel.js similarity index 100% rename from src/skins/vector/views/organisms/RightPanel.js rename to src/components/structures/RightPanel.js diff --git a/src/skins/vector/views/organisms/RoomDirectory.js b/src/components/structures/RoomDirectory.js similarity index 100% rename from src/skins/vector/views/organisms/RoomDirectory.js rename to src/components/structures/RoomDirectory.js diff --git a/src/skins/vector/views/organisms/RoomSubList.js b/src/components/structures/RoomSubList.js similarity index 100% rename from src/skins/vector/views/organisms/RoomSubList.js rename to src/components/structures/RoomSubList.js diff --git a/src/skins/vector/views/organisms/ViewSource.js b/src/components/structures/ViewSource.js similarity index 100% rename from src/skins/vector/views/organisms/ViewSource.js rename to src/components/structures/ViewSource.js diff --git a/src/components/views/rooms/MessageContextMenu.js b/src/components/views/rooms/MessageContextMenu.js index 2aeac39c4f..c6100db2d3 100644 --- a/src/components/views/rooms/MessageContextMenu.js +++ b/src/components/views/rooms/MessageContextMenu.js @@ -33,7 +33,7 @@ module.exports = React.createClass({ }, onViewSourceClick: function() { - var ViewSource = sdk.getComponent('organisms.ViewSource'); + var ViewSource = sdk.getComponent('structures.ViewSource'); Modal.createDialog(ViewSource, { mxEvent: this.props.mxEvent }); diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js index 7fde880890..d5b559c68c 100644 --- a/src/skins/vector/skindex.js +++ b/src/skins/vector/skindex.js @@ -37,7 +37,12 @@ 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'); - +skin['structures.LeftPanel'] = require('../../components/structures/LeftPanel'); +skin['structures.RightPanel'] = require('../../components/structures/RightPanel'); +skin['structures.RoomDirectory'] = require('../../components/structures/RoomDirectory'); +skin['structures.RoomSubList'] = require('../../components/structures/RoomSubList'); +skin['structures.ViewSource'] = require('../../components/structures/ViewSource'); +skin['structures.CompatibilityPage'] = require('../../components/structures/CompatibilityPage'); // TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex? skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar'); @@ -87,13 +92,4 @@ skin['structures.UserSettings'] = require('matrix-react-sdk/lib/components/struc skin['structures.RoomView'] = require('matrix-react-sdk/lib/components/structures/RoomView'); skin['structures.MatrixChat'] = require('matrix-react-sdk/lib/components/structures/MatrixChat'); - -// Old style stuff - this stuff only exists in VECTOR -skin['organisms.LeftPanel'] = require('./views/organisms/LeftPanel'); -skin['organisms.RightPanel'] = require('./views/organisms/RightPanel'); -skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory'); -skin['organisms.RoomSubList'] = require('./views/organisms/RoomSubList'); -skin['organisms.ViewSource'] = require('./views/organisms/ViewSource'); -skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage'); - module.exports = skin; diff --git a/src/vector/index.js b/src/vector/index.js index 082c5e111a..00c22719ad 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -153,7 +153,7 @@ function loadApp() { else { console.error("Browser is missing required features."); // take to a different landing page to AWOOOOOGA at the user - var CompatibilityPage = require("../skins/vector/views/pages/CompatibilityPage"); + var CompatibilityPage = sdk.getComponent("structures.CompatibilityPage"); window.matrixChat = ReactDOM.render(