From 7e72ee891aec0d7f51f18fcacd0410b367575531 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 22 Sep 2015 18:49:04 +0100 Subject: [PATCH] More fixing up of vector skin --- package.json | 6 +- src/skins/vector/header | 15 +++ src/skins/vector/skindex.js | 92 +++++++++++++++++++ src/skins/vector/skinfo.json | 3 + .../vector/views/molecules/EventAsTextTile.js | 5 +- .../vector/views/molecules/MImageTile.js | 5 +- .../vector/views/molecules/MRoomMemberTile.js | 6 +- .../vector/views/molecules/MatrixToolbar.js | 8 +- .../vector/views/molecules/MemberInfo.js | 2 - .../vector/views/molecules/MemberTile.js | 7 +- .../vector/views/molecules/MessageComposer.js | 4 +- .../vector/views/molecules/MessageTile.js | 30 +++--- .../vector/views/molecules/RoomHeader.js | 6 +- src/skins/vector/views/molecules/RoomTile.js | 4 +- .../vector/views/molecules/ServerConfig.js | 5 +- .../vector/views/molecules/voip/CallView.js | 6 +- .../vector/views/molecules/voip/VideoView.js | 4 +- .../vector/views/organisms/CreateRoom.js | 15 +-- src/skins/vector/views/organisms/LeftPanel.js | 12 +-- .../vector/views/organisms/MemberList.js | 8 +- .../vector/views/organisms/RightPanel.js | 5 +- .../vector/views/organisms/RoomDirectory.js | 6 +- src/skins/vector/views/organisms/RoomList.js | 7 +- src/skins/vector/views/organisms/RoomView.js | 12 +-- .../vector/views/organisms/UserSettings.js | 12 +-- src/skins/vector/views/pages/MatrixChat.js | 23 +++-- src/skins/vector/views/templates/Login.js | 7 +- src/skins/vector/views/templates/Register.js | 5 +- vector/index.js | 11 +-- 29 files changed, 216 insertions(+), 115 deletions(-) create mode 100644 src/skins/vector/header create mode 100644 src/skins/vector/skindex.js create mode 100644 src/skins/vector/skinfo.json diff --git a/package.json b/package.json index d6be714a8..bff74693a 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "license": "Apache-2.0", "style": "bundle.css", "scripts": { - "reskindex": "reskindex base -h src/skins/base/header", - "build": "NODE_ENV=production browserify --ignore olm -t reactify src/index.js | uglifyjs -c -m -o vector/bundle.js", - "start": "parallelshell 'watchify --ignore olm -v -d -t reactify src/index.js -o vector/bundle.js' 'npm run start:skins:css' 'http-server vector'", + "reskindex": "reskindex vector -h src/skins/vector/header", + "build": "NODE_ENV=production browserify --ignore olm -t reactify vector/index.js | uglifyjs -c -m -o vector/bundle.js", + "start": "parallelshell 'watchify --ignore olm -v -d -t reactify vector/index.js -o vector/bundle.js' 'npm run start:skins:css' 'http-server vector'", "build:skins:js": "babel src/skins -d lib/skins --source-maps", "build:skins:css": "catw 'src/skins/base/css/**/*.css' -o vector/bundle.css -c uglifycss --no-watch", "start:skins:css": "catw 'src/skins/base/css/**/*.css' -o vector/bundle.css", diff --git a/src/skins/vector/header b/src/skins/vector/header new file mode 100644 index 000000000..fd88ee27f --- /dev/null +++ b/src/skins/vector/header @@ -0,0 +1,15 @@ +/* +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. +*/ diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js new file mode 100644 index 000000000..2b0bf28aa --- /dev/null +++ b/src/skins/vector/skindex.js @@ -0,0 +1,92 @@ +/* +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. +*/ + +/* + * THIS FILE IS AUTO-GENERATED + * You can edit it you like, but your changes will be overwritten, + * so you'd just be trying to swim upstream like a salmon. + * You are not a salmon. + */ + +var skin = { + atoms: {}, + molecules: {}, + organisms: {}, + templates: {}, + pages: {} +}; + +skin.atoms.EditableText = require('./views/atoms/EditableText'); +skin.atoms.EnableNotificationsButton = require('./views/atoms/EnableNotificationsButton'); +skin.atoms.ImageView = require('./views/atoms/ImageView'); +skin.atoms.LogoutButton = require('./views/atoms/LogoutButton'); +skin.atoms.MemberAvatar = require('./views/atoms/MemberAvatar'); +skin.atoms.MessageTimestamp = require('./views/atoms/MessageTimestamp'); +skin.atoms.RoomAvatar = require('./views/atoms/RoomAvatar'); +skin.atoms.create_room = {}; +skin.atoms.create_room.CreateRoomButton = require('./views/atoms/create_room/CreateRoomButton'); +skin.atoms.create_room.Presets = require('./views/atoms/create_room/Presets'); +skin.atoms.create_room.RoomAlias = require('./views/atoms/create_room/RoomAlias'); +skin.atoms.voip = {}; +skin.atoms.voip.VideoFeed = require('./views/atoms/voip/VideoFeed'); +skin.molecules.BottomLeftMenu = require('./views/molecules/BottomLeftMenu'); +skin.molecules.ChangeAvatar = require('./views/molecules/ChangeAvatar'); +skin.molecules.ChangePassword = require('./views/molecules/ChangePassword'); +skin.molecules.ContextualMenu = require('./views/molecules/ContextualMenu'); +skin.molecules.DateSeparator = require('./views/molecules/DateSeparator'); +skin.molecules.EventAsTextTile = require('./views/molecules/EventAsTextTile'); +skin.molecules.MEmoteTile = require('./views/molecules/MEmoteTile'); +skin.molecules.MFileTile = require('./views/molecules/MFileTile'); +skin.molecules.MImageTile = require('./views/molecules/MImageTile'); +skin.molecules.MNoticeTile = require('./views/molecules/MNoticeTile'); +skin.molecules.MRoomMemberTile = require('./views/molecules/MRoomMemberTile'); +skin.molecules.MTextTile = require('./views/molecules/MTextTile'); +skin.molecules.MatrixToolbar = require('./views/molecules/MatrixToolbar'); +skin.molecules.MemberInfo = require('./views/molecules/MemberInfo'); +skin.molecules.MemberTile = require('./views/molecules/MemberTile'); +skin.molecules.MessageComposer = require('./views/molecules/MessageComposer'); +skin.molecules.MessageTile = require('./views/molecules/MessageTile'); +skin.molecules.ProgressBar = require('./views/molecules/ProgressBar'); +skin.molecules.RoomCreate = require('./views/molecules/RoomCreate'); +skin.molecules.RoomDropTarget = require('./views/molecules/RoomDropTarget'); +skin.molecules.RoomHeader = require('./views/molecules/RoomHeader'); +skin.molecules.RoomSettings = require('./views/molecules/RoomSettings'); +skin.molecules.RoomTile = require('./views/molecules/RoomTile'); +skin.molecules.SenderProfile = require('./views/molecules/SenderProfile'); +skin.molecules.ServerConfig = require('./views/molecules/ServerConfig'); +skin.molecules.UnknownMessageTile = require('./views/molecules/UnknownMessageTile'); +skin.molecules.UserSelector = require('./views/molecules/UserSelector'); +skin.molecules.voip = {}; +skin.molecules.voip.CallView = require('./views/molecules/voip/CallView'); +skin.molecules.voip.IncomingCallBox = require('./views/molecules/voip/IncomingCallBox'); +skin.molecules.voip.VideoView = require('./views/molecules/voip/VideoView'); +skin.organisms.CreateRoom = require('./views/organisms/CreateRoom'); +skin.organisms.ErrorDialog = require('./views/organisms/ErrorDialog'); +skin.organisms.LeftPanel = require('./views/organisms/LeftPanel'); +skin.organisms.LogoutPrompt = require('./views/organisms/LogoutPrompt'); +skin.organisms.MemberList = require('./views/organisms/MemberList'); +skin.organisms.Notifier = require('./views/organisms/Notifier'); +skin.organisms.QuestionDialog = require('./views/organisms/QuestionDialog'); +skin.organisms.RightPanel = require('./views/organisms/RightPanel'); +skin.organisms.RoomDirectory = require('./views/organisms/RoomDirectory'); +skin.organisms.RoomList = require('./views/organisms/RoomList'); +skin.organisms.RoomView = require('./views/organisms/RoomView'); +skin.organisms.UserSettings = require('./views/organisms/UserSettings'); +skin.pages.MatrixChat = require('./views/pages/MatrixChat'); +skin.templates.Login = require('./views/templates/Login'); +skin.templates.Register = require('./views/templates/Register'); + +module.exports = skin; \ No newline at end of file diff --git a/src/skins/vector/skinfo.json b/src/skins/vector/skinfo.json new file mode 100644 index 000000000..287ff9e23 --- /dev/null +++ b/src/skins/vector/skinfo.json @@ -0,0 +1,3 @@ +{ + "baseSkin": "" +} diff --git a/src/skins/vector/views/molecules/EventAsTextTile.js b/src/skins/vector/views/molecules/EventAsTextTile.js index ded32b225..16a1e6130 100644 --- a/src/skins/vector/views/molecules/EventAsTextTile.js +++ b/src/skins/vector/views/molecules/EventAsTextTile.js @@ -20,7 +20,7 @@ var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile') -var ComponentBroker = require('../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp'); var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); var TextForEvent = require("../../../../src/TextForEvent"); @@ -30,6 +30,9 @@ module.exports = React.createClass({ mixins: [EventAsTextTileController], render: function() { + var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp'); + var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); + var text = TextForEvent.textForEvent(this.props.mxEvent); if (text == null || text.length == 0) return null; diff --git a/src/skins/vector/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js index de6feb680..ca7b4cb6f 100644 --- a/src/skins/vector/views/molecules/MImageTile.js +++ b/src/skins/vector/views/molecules/MImageTile.js @@ -23,9 +23,7 @@ var MImageTileController = require('matrix-react-sdk/lib/controllers/molecules/M var MatrixClientPeg = require('../../../../src/MatrixClientPeg'); var Modal = require('../../../../src/Modal'); -var ComponentBroker = require('../../../../src/ComponentBroker'); - -var ImageView = ComponentBroker.get("atoms/ImageView"); +var sdk = require('matrix-react-sdk') module.exports = React.createClass({ displayName: 'MImageTile', @@ -59,6 +57,7 @@ module.exports = React.createClass({ ev.preventDefault(); var content = this.props.mxEvent.getContent(); var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(content.url); + var ImageView = sdk.getComponent("atoms.ImageView"); Modal.createDialog(ImageView, { src: httpUrl, width: content.info.w, diff --git a/src/skins/vector/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js index 8a08a9a6f..6e70f4964 100644 --- a/src/skins/vector/views/molecules/MRoomMemberTile.js +++ b/src/skins/vector/views/molecules/MRoomMemberTile.js @@ -21,10 +21,8 @@ var React = require('react'); var MRoomMemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MRoomMemberTile') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var TextForEvent = require('../../../../src/TextForEvent'); -var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp'); -var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); module.exports = React.createClass({ displayName: 'MRoomMemberTile', @@ -39,6 +37,8 @@ module.exports = React.createClass({ var timestamp = this.props.last ? : null; var text = this.getMemberEventText(); if (!text) return
; + var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp'); + var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); return (
diff --git a/src/skins/vector/views/molecules/MatrixToolbar.js b/src/skins/vector/views/molecules/MatrixToolbar.js index 7d9cfa659..0b6c58e0d 100644 --- a/src/skins/vector/views/molecules/MatrixToolbar.js +++ b/src/skins/vector/views/molecules/MatrixToolbar.js @@ -18,23 +18,21 @@ limitations under the License. var React = require('react'); -var ComponentBroker = require('../../../../src/ComponentBroker'); - -var LogoutButton = ComponentBroker.get("atoms/LogoutButton"); -var EnableNotificationsButton = ComponentBroker.get("atoms/EnableNotificationsButton"); +var sdk = require('matrix-react-sdk') var MatrixToolbarController = require('matrix-react-sdk/lib/controllers/molecules/MatrixToolbar') -var Notifier = ComponentBroker.get('organisms/Notifier'); module.exports = React.createClass({ displayName: 'MatrixToolbar', mixins: [MatrixToolbarController], hideToolbar: function() { + var Notifier = sdk.getComponent('organisms.Notifier'); Notifier.setToolbarHidden(true); }, render: function() { + var EnableNotificationsButton = sdk.getComponent("atoms.EnableNotificationsButton"); return (
You are not receiving desktop notifications. diff --git a/src/skins/vector/views/molecules/MemberInfo.js b/src/skins/vector/views/molecules/MemberInfo.js index 94ee19cfd..6d2d0dd75 100644 --- a/src/skins/vector/views/molecules/MemberInfo.js +++ b/src/skins/vector/views/molecules/MemberInfo.js @@ -20,8 +20,6 @@ var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var MemberInfoController = require('matrix-react-sdk/lib/controllers/molecules/MemberInfo') -var ComponentBroker = require('../../../../src/ComponentBroker'); -var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); module.exports = React.createClass({ displayName: 'MemberInfo', diff --git a/src/skins/vector/views/molecules/MemberTile.js b/src/skins/vector/views/molecules/MemberTile.js index 00e220e2a..0c0181db2 100644 --- a/src/skins/vector/views/molecules/MemberTile.js +++ b/src/skins/vector/views/molecules/MemberTile.js @@ -19,13 +19,10 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var Modal = require("../../../../src/Modal"); var ContextualMenu = require("../../../../src/ContextualMenu"); var MemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MemberTile') -var MemberInfo = ComponentBroker.get('molecules/MemberInfo'); -var ErrorDialog = ComponentBroker.get("organisms/ErrorDialog"); -var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); // The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them. // Revert to Arial when this happens, which on OSX works at least. @@ -46,6 +43,7 @@ module.exports = React.createClass({ onClick: function(e) { var self = this; self.setState({ 'menu': true }); + var MemberInfo = sdk.getComponent('molecules.MemberInfo'); ContextualMenu.createMenu(MemberInfo, { member: self.props.member, right: window.innerWidth - e.pageX, @@ -153,6 +151,7 @@ module.exports = React.createClass({
} + var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); return (
diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js index 82da557ae..6b6eeba99 100644 --- a/src/skins/vector/views/molecules/MessageComposer.js +++ b/src/skins/vector/views/molecules/MessageComposer.js @@ -22,8 +22,7 @@ var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer') var ContentMessages = require("../../../../src/ContentMessages"); -var ComponentBroker = require('../../../../src/ComponentBroker'); -var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); +var sdk = require('matrix-react-sdk') module.exports = React.createClass({ displayName: 'MessageComposer', @@ -45,6 +44,7 @@ module.exports = React.createClass({ render: function() { var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId); var uploadInputStyle = {display: 'none'}; + var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); return (
diff --git a/src/skins/vector/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js index db6816b7f..09cb0743d 100644 --- a/src/skins/vector/views/molecules/MessageTile.js +++ b/src/skins/vector/views/molecules/MessageTile.js @@ -21,21 +21,7 @@ var React = require('react'); var classNames = require("classnames"); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../src/ComponentBroker'); - -var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp'); -var SenderProfile = ComponentBroker.get('molecules/SenderProfile'); -var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); - -var UnknownMessageTile = ComponentBroker.get('molecules/UnknownMessageTile'); - -var tileTypes = { - 'm.text': ComponentBroker.get('molecules/MTextTile'), - 'm.notice': ComponentBroker.get('molecules/MNoticeTile'), - 'm.emote': ComponentBroker.get('molecules/MEmoteTile'), - 'm.image': ComponentBroker.get('molecules/MImageTile'), - 'm.file': ComponentBroker.get('molecules/MFileTile') -}; +var sdk = require('matrix-react-sdk') var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile') @@ -44,6 +30,20 @@ module.exports = React.createClass({ mixins: [MessageTileController], render: function() { + var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp'); + var SenderProfile = sdk.getComponent('molecules.SenderProfile'); + var MemberAvatar = sdk.getComponent('atoms.MemberAvatar'); + + var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile'); + + var tileTypes = { + 'm.text': sdk.getComponent('molecules.MTextTile'), + 'm.notice': sdk.getComponent('molecules.MNoticeTile'), + 'm.emote': sdk.getComponent('molecules.MEmoteTile'), + 'm.image': sdk.getComponent('molecules.MImageTile'), + 'm.file': sdk.getComponent('molecules.MFileTile') + }; + var content = this.props.mxEvent.getContent(); var msgtype = content.msgtype; var TileType = UnknownMessageTile; diff --git a/src/skins/vector/views/molecules/RoomHeader.js b/src/skins/vector/views/molecules/RoomHeader.js index 3753a5dee..02b2ea33e 100644 --- a/src/skins/vector/views/molecules/RoomHeader.js +++ b/src/skins/vector/views/molecules/RoomHeader.js @@ -17,12 +17,10 @@ limitations under the License. 'use strict'; var React = require('react'); -var ComponentBroker = require('../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var RoomHeaderController = require('matrix-react-sdk/lib/controllers/molecules/RoomHeader') -var EditableText = ComponentBroker.get("atoms/EditableText"); -var RoomAvatar = ComponentBroker.get('atoms/RoomAvatar'); module.exports = React.createClass({ displayName: 'RoomHeader', @@ -39,6 +37,8 @@ module.exports = React.createClass({ }, render: function() { + var EditableText = sdk.getComponent("atoms.EditableText"); + var RoomAvatar = sdk.getComponent('atoms.RoomAvatar'); var header; if (this.props.simpleHeader) { diff --git a/src/skins/vector/views/molecules/RoomTile.js b/src/skins/vector/views/molecules/RoomTile.js index fdcbc7137..d1ac37501 100644 --- a/src/skins/vector/views/molecules/RoomTile.js +++ b/src/skins/vector/views/molecules/RoomTile.js @@ -23,8 +23,7 @@ var RoomTileController = require('matrix-react-sdk/lib/controllers/molecules/Roo var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../src/ComponentBroker'); -var RoomAvatar = ComponentBroker.get('atoms/RoomAvatar'); +var sdk = require('matrix-react-sdk') module.exports = React.createClass({ displayName: 'RoomTile', @@ -58,6 +57,7 @@ module.exports = React.createClass({ nameCell =
{name}
; } */ + var RoomAvatar = sdk.getComponent('atoms.RoomAvatar'); return (
diff --git a/src/skins/vector/views/molecules/ServerConfig.js b/src/skins/vector/views/molecules/ServerConfig.js index e19c89bb5..d2dd23b6e 100644 --- a/src/skins/vector/views/molecules/ServerConfig.js +++ b/src/skins/vector/views/molecules/ServerConfig.js @@ -18,9 +18,7 @@ limitations under the License. var React = require('react'); var Modal = require('../../../../src/Modal'); -var ComponentBroker = require('../../../../src/ComponentBroker'); - -var ErrorDialog = ComponentBroker.get('organisms/ErrorDialog'); +var sdk = require('matrix-react-sdk') var ServerConfigController = require('matrix-react-sdk/lib/controllers/molecules/ServerConfig') @@ -29,6 +27,7 @@ module.exports = React.createClass({ mixins: [ServerConfigController], showHelpPopup: function() { + var ErrorDialog = sdk.getComponent('organisms.ErrorDialog'); Modal.createDialog(ErrorDialog, { title: 'Custom Server Options', description: "You can use the custom server options to log into other Matrix servers by specifying a different Home server URL. This allows you to use Vector with an existing Matrix account on a different Home server. You can also set a cutom Identity server but this will affect people ability to find you if you use a server in a group other than tha main Matrix.org group.", diff --git a/src/skins/vector/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js index 6957c6d8e..b55f7b0dc 100644 --- a/src/skins/vector/views/molecules/voip/CallView.js +++ b/src/skins/vector/views/molecules/voip/CallView.js @@ -19,11 +19,10 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var CallViewController = require( - "../../../../../src/controllers/molecules/voip/CallView" + "matrix-react-sdk/lib/controllers/molecules/voip/CallView" ); -var VideoView = ComponentBroker.get('molecules/voip/VideoView'); module.exports = React.createClass({ displayName: 'CallView', @@ -34,6 +33,7 @@ module.exports = React.createClass({ }, render: function(){ + var VideoView = sdk.getComponent('molecules.voip.VideoView'); return ( ); diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js index 0917aabde..aa6897ebd 100644 --- a/src/skins/vector/views/molecules/voip/VideoView.js +++ b/src/skins/vector/views/molecules/voip/VideoView.js @@ -19,9 +19,8 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../../src/MatrixClientPeg"); -var ComponentBroker = require('../../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var VideoViewController = require('matrix-react-sdk/lib/controllers/molecules/voip/VideoView') -var VideoFeed = ComponentBroker.get('atoms/voip/VideoFeed'); module.exports = React.createClass({ displayName: 'VideoView', @@ -36,6 +35,7 @@ module.exports = React.createClass({ }, render: function() { + var VideoFeed = sdk.getComponent('atoms.voip.VideoFeed'); return (
diff --git a/src/skins/vector/views/organisms/CreateRoom.js b/src/skins/vector/views/organisms/CreateRoom.js index 3766404a1..82883d1ef 100644 --- a/src/skins/vector/views/organisms/CreateRoom.js +++ b/src/skins/vector/views/organisms/CreateRoom.js @@ -20,16 +20,10 @@ var React = require('react'); var CreateRoomController = require('matrix-react-sdk/lib/controllers/organisms/CreateRoom') -var ComponentBroker = require('../../../../src/ComponentBroker'); +var sdk = require('matrix-react-sdk') var PresetValues = require('../../../../src/controllers/atoms/create_room/Presets').Presets; -var CreateRoomButton = ComponentBroker.get("atoms/create_room/CreateRoomButton"); -var RoomAlias = ComponentBroker.get("atoms/create_room/RoomAlias"); -var Presets = ComponentBroker.get("atoms/create_room/Presets"); -var UserSelector = ComponentBroker.get("molecules/UserSelector"); -var RoomHeader = ComponentBroker.get("molecules/RoomHeader"); - var Loader = require("react-loader"); @@ -140,6 +134,13 @@ module.exports = React.createClass({
); } + + var CreateRoomButton = sdk.getComponent("atoms.create_room.CreateRoomButton"); + var RoomAlias = sdk.getComponent("atoms.create_room.RoomAlias"); + var Presets = sdk.getComponent("atoms.create_room.Presets"); + var UserSelector = sdk.getComponent("molecules.UserSelector"); + var RoomHeader = sdk.getComponent("molecules.RoomHeader"); + return (
diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/skins/vector/views/organisms/LeftPanel.js index a7c2a8b91..9941cfa21 100644 --- a/src/skins/vector/views/organisms/LeftPanel.js +++ b/src/skins/vector/views/organisms/LeftPanel.js @@ -17,17 +17,17 @@ limitations under the License. 'use strict'; var React = require('react'); -var ComponentBroker = require('../../../../src/ComponentBroker'); - -var RoomList = ComponentBroker.get('organisms/RoomList'); -var BottomLeftMenu = ComponentBroker.get('molecules/BottomLeftMenu'); -var IncomingCallBox = ComponentBroker.get('molecules/voip/IncomingCallBox'); -var RoomCreate = ComponentBroker.get('molecules/RoomCreate'); +var sdk = require('matrix-react-sdk') module.exports = React.createClass({ displayName: 'LeftPanel', render: function() { + var RoomList = sdk.getComponent('organisms.RoomList'); + var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu'); + var IncomingCallBox = sdk.getComponent('molecules.voip.IncomingCallBox'); + var RoomCreate = sdk.getComponent('molecules.RoomCreate'); + return (