From 40594fc5fa0c44577306ccafea58810913a4d7ac Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 22 Sep 2015 18:17:19 +0100 Subject: [PATCH] Fix up controller requires --- src/skins/vector/views/atoms/EditableText.js | 2 +- src/skins/vector/views/atoms/EnableNotificationsButton.js | 2 +- src/skins/vector/views/atoms/ImageView.js | 2 +- src/skins/vector/views/atoms/LogoutButton.js | 2 +- src/skins/vector/views/atoms/MemberAvatar.js | 2 +- src/skins/vector/views/atoms/MessageTimestamp.js | 2 +- src/skins/vector/views/atoms/RoomAvatar.js | 2 +- src/skins/vector/views/atoms/create_room/CreateRoomButton.js | 2 +- src/skins/vector/views/atoms/create_room/Presets.js | 2 +- src/skins/vector/views/atoms/create_room/RoomAlias.js | 2 +- src/skins/vector/views/atoms/voip/VideoFeed.js | 2 +- src/skins/vector/views/molecules/ChangeAvatar.js | 2 +- src/skins/vector/views/molecules/ChangePassword.js | 2 +- src/skins/vector/views/molecules/EventAsTextTile.js | 2 +- src/skins/vector/views/molecules/MEmoteTile.js | 2 +- src/skins/vector/views/molecules/MFileTile.js | 2 +- src/skins/vector/views/molecules/MImageTile.js | 2 +- src/skins/vector/views/molecules/MNoticeTile.js | 2 +- src/skins/vector/views/molecules/MRoomMemberTile.js | 2 +- src/skins/vector/views/molecules/MTextTile.js | 2 +- src/skins/vector/views/molecules/MatrixToolbar.js | 2 +- src/skins/vector/views/molecules/MemberInfo.js | 2 +- src/skins/vector/views/molecules/MemberTile.js | 2 +- src/skins/vector/views/molecules/MessageComposer.js | 2 +- src/skins/vector/views/molecules/MessageTile.js | 2 +- src/skins/vector/views/molecules/ProgressBar.js | 2 +- src/skins/vector/views/molecules/RoomCreate.js | 2 +- src/skins/vector/views/molecules/RoomDropTarget.js | 2 +- src/skins/vector/views/molecules/RoomHeader.js | 2 +- src/skins/vector/views/molecules/RoomSettings.js | 2 +- src/skins/vector/views/molecules/RoomTile.js | 2 +- src/skins/vector/views/molecules/SenderProfile.js | 2 +- src/skins/vector/views/molecules/ServerConfig.js | 2 +- src/skins/vector/views/molecules/UnknownMessageTile.js | 2 +- src/skins/vector/views/molecules/UserSelector.js | 2 +- src/skins/vector/views/molecules/voip/CallView.js | 2 +- src/skins/vector/views/molecules/voip/VideoView.js | 4 ++-- src/skins/vector/views/organisms/CreateRoom.js | 2 +- src/skins/vector/views/organisms/ErrorDialog.js | 2 +- src/skins/vector/views/organisms/LogoutPrompt.js | 2 +- src/skins/vector/views/organisms/MemberList.js | 2 +- src/skins/vector/views/organisms/Notifier.js | 2 +- src/skins/vector/views/organisms/QuestionDialog.js | 2 +- src/skins/vector/views/organisms/RoomList.js | 2 +- src/skins/vector/views/organisms/RoomView.js | 2 +- src/skins/vector/views/organisms/UserSettings.js | 2 +- src/skins/vector/views/pages/MatrixChat.js | 2 +- src/skins/vector/views/templates/Login.js | 2 +- src/skins/vector/views/templates/Register.js | 2 +- 49 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/skins/vector/views/atoms/EditableText.js b/src/skins/vector/views/atoms/EditableText.js index d4aa285790..1848b029a6 100644 --- a/src/skins/vector/views/atoms/EditableText.js +++ b/src/skins/vector/views/atoms/EditableText.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var EditableTextController = require("../../../../src/controllers/atoms/EditableText"); +var EditableTextController = require('matrix-react-sdk/lib/controllers/atoms/EditableText') module.exports = React.createClass({ displayName: 'EditableText', diff --git a/src/skins/vector/views/atoms/EnableNotificationsButton.js b/src/skins/vector/views/atoms/EnableNotificationsButton.js index 7caebb76c5..edef9edc68 100644 --- a/src/skins/vector/views/atoms/EnableNotificationsButton.js +++ b/src/skins/vector/views/atoms/EnableNotificationsButton.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var EnableNotificationsButtonController = require("../../../../src/controllers/atoms/EnableNotificationsButton"); +var EnableNotificationsButtonController = require('matrix-react-sdk/lib/controllers/atoms/EnableNotificationsButton') module.exports = React.createClass({ displayName: 'EnableNotificationsButton', diff --git a/src/skins/vector/views/atoms/ImageView.js b/src/skins/vector/views/atoms/ImageView.js index 196e92fe9c..d5c5714124 100644 --- a/src/skins/vector/views/atoms/ImageView.js +++ b/src/skins/vector/views/atoms/ImageView.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var ImageViewController = require("../../../../src/controllers/atoms/ImageView"); +var ImageViewController = require('matrix-react-sdk/lib/controllers/atoms/ImageView') module.exports = React.createClass({ displayName: 'ImageView', diff --git a/src/skins/vector/views/atoms/LogoutButton.js b/src/skins/vector/views/atoms/LogoutButton.js index 8cc5b27d5e..619160f61c 100644 --- a/src/skins/vector/views/atoms/LogoutButton.js +++ b/src/skins/vector/views/atoms/LogoutButton.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var LogoutButtonController = require("../../../../src/controllers/atoms/LogoutButton"); +var LogoutButtonController = require('matrix-react-sdk/lib/controllers/atoms/LogoutButton') module.exports = React.createClass({ displayName: 'LogoutButton', diff --git a/src/skins/vector/views/atoms/MemberAvatar.js b/src/skins/vector/views/atoms/MemberAvatar.js index dccf0852d0..bd20723d19 100644 --- a/src/skins/vector/views/atoms/MemberAvatar.js +++ b/src/skins/vector/views/atoms/MemberAvatar.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MemberAvatarController = require("../../../../src/controllers/atoms/MemberAvatar"); +var MemberAvatarController = require('matrix-react-sdk/lib/controllers/atoms/MemberAvatar') module.exports = React.createClass({ displayName: 'MemberAvatar', diff --git a/src/skins/vector/views/atoms/MessageTimestamp.js b/src/skins/vector/views/atoms/MessageTimestamp.js index 52eb1462eb..ef866afa5e 100644 --- a/src/skins/vector/views/atoms/MessageTimestamp.js +++ b/src/skins/vector/views/atoms/MessageTimestamp.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MessageTimestampController = require("../../../../src/controllers/atoms/MessageTimestamp"); +var MessageTimestampController = require('matrix-react-sdk/lib/controllers/atoms/MessageTimestamp') module.exports = React.createClass({ displayName: 'MessageTimestamp', diff --git a/src/skins/vector/views/atoms/RoomAvatar.js b/src/skins/vector/views/atoms/RoomAvatar.js index 48dbadef52..ec2bf5ec21 100644 --- a/src/skins/vector/views/atoms/RoomAvatar.js +++ b/src/skins/vector/views/atoms/RoomAvatar.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var RoomAvatarController = require("../../../../src/controllers/atoms/RoomAvatar"); +var RoomAvatarController = require('matrix-react-sdk/lib/controllers/atoms/RoomAvatar') module.exports = React.createClass({ displayName: 'RoomAvatar', diff --git a/src/skins/vector/views/atoms/create_room/CreateRoomButton.js b/src/skins/vector/views/atoms/create_room/CreateRoomButton.js index 2f9ccae030..2fc9d057a0 100644 --- a/src/skins/vector/views/atoms/create_room/CreateRoomButton.js +++ b/src/skins/vector/views/atoms/create_room/CreateRoomButton.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var CreateRoomButtonController = require("../../../../../src/controllers/atoms/create_room/CreateRoomButton"); +var CreateRoomButtonController = require('matrix-react-sdk/lib/controllers/atoms/create_room/CreateRoomButton') module.exports = React.createClass({ displayName: 'CreateRoomButton', diff --git a/src/skins/vector/views/atoms/create_room/Presets.js b/src/skins/vector/views/atoms/create_room/Presets.js index 271702b18a..a098a7d7e8 100644 --- a/src/skins/vector/views/atoms/create_room/Presets.js +++ b/src/skins/vector/views/atoms/create_room/Presets.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var PresetsController = require("../../../../../src/controllers/atoms/create_room/Presets"); +var PresetsController = require('matrix-react-sdk/lib/controllers/atoms/create_room/Presets') module.exports = React.createClass({ displayName: 'CreateRoomPresets', diff --git a/src/skins/vector/views/atoms/create_room/RoomAlias.js b/src/skins/vector/views/atoms/create_room/RoomAlias.js index a59a8e69ad..0a8cadc888 100644 --- a/src/skins/vector/views/atoms/create_room/RoomAlias.js +++ b/src/skins/vector/views/atoms/create_room/RoomAlias.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var RoomAliasController = require("../../../../../src/controllers/atoms/create_room/RoomAlias"); +var RoomAliasController = require('matrix-react-sdk/lib/controllers/atoms/create_room/RoomAlias') module.exports = React.createClass({ displayName: 'RoomAlias', diff --git a/src/skins/vector/views/atoms/voip/VideoFeed.js b/src/skins/vector/views/atoms/voip/VideoFeed.js index 7fbee43699..748a431a1e 100644 --- a/src/skins/vector/views/atoms/voip/VideoFeed.js +++ b/src/skins/vector/views/atoms/voip/VideoFeed.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var VideoFeedController = require("../../../../../src/controllers/atoms/voip/VideoFeed"); +var VideoFeedController = require('matrix-react-sdk/lib/controllers/atoms/voip/VideoFeed') module.exports = React.createClass({ displayName: 'VideoFeed', diff --git a/src/skins/vector/views/molecules/ChangeAvatar.js b/src/skins/vector/views/molecules/ChangeAvatar.js index e70da3a703..8fafacc863 100644 --- a/src/skins/vector/views/molecules/ChangeAvatar.js +++ b/src/skins/vector/views/molecules/ChangeAvatar.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var ChangeAvatarController = require("../../../../src/controllers/molecules/ChangeAvatar"); +var ChangeAvatarController = require('matrix-react-sdk/lib/controllers/molecules/ChangeAvatar') var Loader = require("react-loader"); diff --git a/src/skins/vector/views/molecules/ChangePassword.js b/src/skins/vector/views/molecules/ChangePassword.js index 2f92f9ab3f..004fed3982 100644 --- a/src/skins/vector/views/molecules/ChangePassword.js +++ b/src/skins/vector/views/molecules/ChangePassword.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var ChangePasswordController = require("../../../../src/controllers/molecules/ChangePassword"); +var ChangePasswordController = require('matrix-react-sdk/lib/controllers/molecules/ChangePassword') var Loader = require("react-loader"); diff --git a/src/skins/vector/views/molecules/EventAsTextTile.js b/src/skins/vector/views/molecules/EventAsTextTile.js index c22db0c4fb..ded32b2254 100644 --- a/src/skins/vector/views/molecules/EventAsTextTile.js +++ b/src/skins/vector/views/molecules/EventAsTextTile.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var EventAsTextTileController = require("../../../../src/controllers/molecules/EventAsTextTile"); +var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile') var ComponentBroker = require('../../../../src/ComponentBroker'); var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp'); var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); diff --git a/src/skins/vector/views/molecules/MEmoteTile.js b/src/skins/vector/views/molecules/MEmoteTile.js index 1125a307f5..de2d93650b 100644 --- a/src/skins/vector/views/molecules/MEmoteTile.js +++ b/src/skins/vector/views/molecules/MEmoteTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MEmoteTileController = require("../../../../src/controllers/molecules/MEmoteTile"); +var MEmoteTileController = require('matrix-react-sdk/lib/controllers/molecules/MEmoteTile') module.exports = React.createClass({ displayName: 'MEmoteTile', diff --git a/src/skins/vector/views/molecules/MFileTile.js b/src/skins/vector/views/molecules/MFileTile.js index a0b4465e87..f0c2ab67a9 100644 --- a/src/skins/vector/views/molecules/MFileTile.js +++ b/src/skins/vector/views/molecules/MFileTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MFileTileController = require("../../../../src/controllers/molecules/MFileTile"); +var MFileTileController = require('matrix-react-sdk/lib/controllers/molecules/MFileTile') var MatrixClientPeg = require('../../../../src/MatrixClientPeg'); diff --git a/src/skins/vector/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js index 6b95f7ef6f..de6feb6806 100644 --- a/src/skins/vector/views/molecules/MImageTile.js +++ b/src/skins/vector/views/molecules/MImageTile.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var filesize = require('filesize'); -var MImageTileController = require("../../../../src/controllers/molecules/MImageTile"); +var MImageTileController = require('matrix-react-sdk/lib/controllers/molecules/MImageTile') var MatrixClientPeg = require('../../../../src/MatrixClientPeg'); var Modal = require('../../../../src/Modal'); diff --git a/src/skins/vector/views/molecules/MNoticeTile.js b/src/skins/vector/views/molecules/MNoticeTile.js index f63a8c2cea..aa88612784 100644 --- a/src/skins/vector/views/molecules/MNoticeTile.js +++ b/src/skins/vector/views/molecules/MNoticeTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MNoticeTileController = require("../../../../src/controllers/molecules/MNoticeTile"); +var MNoticeTileController = require('matrix-react-sdk/lib/controllers/molecules/MNoticeTile') module.exports = React.createClass({ displayName: 'MNoticeTile', diff --git a/src/skins/vector/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js index fb65d37572..8a08a9a6f5 100644 --- a/src/skins/vector/views/molecules/MRoomMemberTile.js +++ b/src/skins/vector/views/molecules/MRoomMemberTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MRoomMemberTileController = require("../../../../src/controllers/molecules/MRoomMemberTile"); +var MRoomMemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MRoomMemberTile') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var ComponentBroker = require('../../../../src/ComponentBroker'); diff --git a/src/skins/vector/views/molecules/MTextTile.js b/src/skins/vector/views/molecules/MTextTile.js index d08f42ed9a..50555f949f 100644 --- a/src/skins/vector/views/molecules/MTextTile.js +++ b/src/skins/vector/views/molecules/MTextTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var MTextTileController = require("../../../../src/controllers/molecules/MTextTile"); +var MTextTileController = require('matrix-react-sdk/lib/controllers/molecules/MTextTile') module.exports = React.createClass({ displayName: 'MTextTile', diff --git a/src/skins/vector/views/molecules/MatrixToolbar.js b/src/skins/vector/views/molecules/MatrixToolbar.js index f72304e1fa..7d9cfa6598 100644 --- a/src/skins/vector/views/molecules/MatrixToolbar.js +++ b/src/skins/vector/views/molecules/MatrixToolbar.js @@ -23,7 +23,7 @@ var ComponentBroker = require('../../../../src/ComponentBroker'); var LogoutButton = ComponentBroker.get("atoms/LogoutButton"); var EnableNotificationsButton = ComponentBroker.get("atoms/EnableNotificationsButton"); -var MatrixToolbarController = require("../../../../src/controllers/molecules/MatrixToolbar"); +var MatrixToolbarController = require('matrix-react-sdk/lib/controllers/molecules/MatrixToolbar') var Notifier = ComponentBroker.get('organisms/Notifier'); module.exports = React.createClass({ diff --git a/src/skins/vector/views/molecules/MemberInfo.js b/src/skins/vector/views/molecules/MemberInfo.js index b57a5b6fc2..94ee19cfdc 100644 --- a/src/skins/vector/views/molecules/MemberInfo.js +++ b/src/skins/vector/views/molecules/MemberInfo.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var MemberInfoController = require("../../../../src/controllers/molecules/MemberInfo"); +var MemberInfoController = require('matrix-react-sdk/lib/controllers/molecules/MemberInfo') var ComponentBroker = require('../../../../src/ComponentBroker'); var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar'); diff --git a/src/skins/vector/views/molecules/MemberTile.js b/src/skins/vector/views/molecules/MemberTile.js index 1414b562dc..00e220e2ab 100644 --- a/src/skins/vector/views/molecules/MemberTile.js +++ b/src/skins/vector/views/molecules/MemberTile.js @@ -22,7 +22,7 @@ var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var ComponentBroker = require('../../../../src/ComponentBroker'); var Modal = require("../../../../src/Modal"); var ContextualMenu = require("../../../../src/ContextualMenu"); -var MemberTileController = require("../../../../src/controllers/molecules/MemberTile"); +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'); diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js index a8d8a4ebab..82da557ae2 100644 --- a/src/skins/vector/views/molecules/MessageComposer.js +++ b/src/skins/vector/views/molecules/MessageComposer.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var MessageComposerController = require("../../../../src/controllers/molecules/MessageComposer"); +var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer') var ContentMessages = require("../../../../src/ContentMessages"); var ComponentBroker = require('../../../../src/ComponentBroker'); diff --git a/src/skins/vector/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js index ac6342ac5f..db6816b7fe 100644 --- a/src/skins/vector/views/molecules/MessageTile.js +++ b/src/skins/vector/views/molecules/MessageTile.js @@ -37,7 +37,7 @@ var tileTypes = { 'm.file': ComponentBroker.get('molecules/MFileTile') }; -var MessageTileController = require("../../../../src/controllers/molecules/MessageTile"); +var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile') module.exports = React.createClass({ displayName: 'MessageTile', diff --git a/src/skins/vector/views/molecules/ProgressBar.js b/src/skins/vector/views/molecules/ProgressBar.js index 0946ffcc26..18d1440ad8 100644 --- a/src/skins/vector/views/molecules/ProgressBar.js +++ b/src/skins/vector/views/molecules/ProgressBar.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var ProgressBarController = require("../../../../src/controllers/molecules/ProgressBar"); +var ProgressBarController = require('matrix-react-sdk/lib/controllers/molecules/ProgressBar') module.exports = React.createClass({ displayName: 'ProgressBar', diff --git a/src/skins/vector/views/molecules/RoomCreate.js b/src/skins/vector/views/molecules/RoomCreate.js index 9ad4f428ef..bb8245780c 100644 --- a/src/skins/vector/views/molecules/RoomCreate.js +++ b/src/skins/vector/views/molecules/RoomCreate.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var classNames = require('classnames'); -//var RoomCreateController = require("../../../../src/controllers/molecules/RoomCreateController"); +//var RoomCreateController = require('matrix-react-sdk/lib/controllers/molecules/RoomCreateController') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); diff --git a/src/skins/vector/views/molecules/RoomDropTarget.js b/src/skins/vector/views/molecules/RoomDropTarget.js index 0a076949c3..ac9c8d445f 100644 --- a/src/skins/vector/views/molecules/RoomDropTarget.js +++ b/src/skins/vector/views/molecules/RoomDropTarget.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var classNames = require('classnames'); -//var RoomDropTargetController = require("../../../../src/controllers/molecules/RoomDropTargetController"); +//var RoomDropTargetController = require('matrix-react-sdk/lib/controllers/molecules/RoomDropTargetController') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); diff --git a/src/skins/vector/views/molecules/RoomHeader.js b/src/skins/vector/views/molecules/RoomHeader.js index e3003b88cc..3753a5deed 100644 --- a/src/skins/vector/views/molecules/RoomHeader.js +++ b/src/skins/vector/views/molecules/RoomHeader.js @@ -20,7 +20,7 @@ var React = require('react'); var ComponentBroker = require('../../../../src/ComponentBroker'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var RoomHeaderController = require("../../../../src/controllers/molecules/RoomHeader"); +var RoomHeaderController = require('matrix-react-sdk/lib/controllers/molecules/RoomHeader') var EditableText = ComponentBroker.get("atoms/EditableText"); var RoomAvatar = ComponentBroker.get('atoms/RoomAvatar'); diff --git a/src/skins/vector/views/molecules/RoomSettings.js b/src/skins/vector/views/molecules/RoomSettings.js index 7f48df2056..05bdae8f43 100644 --- a/src/skins/vector/views/molecules/RoomSettings.js +++ b/src/skins/vector/views/molecules/RoomSettings.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var RoomSettingsController = require("../../../../src/controllers/molecules/RoomSettings"); +var RoomSettingsController = require('matrix-react-sdk/lib/controllers/molecules/RoomSettings') module.exports = React.createClass({ displayName: 'RoomSettings', diff --git a/src/skins/vector/views/molecules/RoomTile.js b/src/skins/vector/views/molecules/RoomTile.js index b8e41fb8dd..fdcbc7137f 100644 --- a/src/skins/vector/views/molecules/RoomTile.js +++ b/src/skins/vector/views/molecules/RoomTile.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var classNames = require('classnames'); -var RoomTileController = require("../../../../src/controllers/molecules/RoomTile"); +var RoomTileController = require('matrix-react-sdk/lib/controllers/molecules/RoomTile') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); diff --git a/src/skins/vector/views/molecules/SenderProfile.js b/src/skins/vector/views/molecules/SenderProfile.js index f13b29cf61..8be3adf27a 100644 --- a/src/skins/vector/views/molecules/SenderProfile.js +++ b/src/skins/vector/views/molecules/SenderProfile.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var classNames = require("classnames"); -var SenderProfileController = require("../../../../src/controllers/molecules/SenderProfile"); +var SenderProfileController = require('matrix-react-sdk/lib/controllers/molecules/SenderProfile') // 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. diff --git a/src/skins/vector/views/molecules/ServerConfig.js b/src/skins/vector/views/molecules/ServerConfig.js index 56241a2aa1..e19c89bb51 100644 --- a/src/skins/vector/views/molecules/ServerConfig.js +++ b/src/skins/vector/views/molecules/ServerConfig.js @@ -22,7 +22,7 @@ var ComponentBroker = require('../../../../src/ComponentBroker'); var ErrorDialog = ComponentBroker.get('organisms/ErrorDialog'); -var ServerConfigController = require("../../../../src/controllers/molecules/ServerConfig"); +var ServerConfigController = require('matrix-react-sdk/lib/controllers/molecules/ServerConfig') module.exports = React.createClass({ displayName: 'ServerConfig', diff --git a/src/skins/vector/views/molecules/UnknownMessageTile.js b/src/skins/vector/views/molecules/UnknownMessageTile.js index b965a4a1fd..d5a20c878e 100644 --- a/src/skins/vector/views/molecules/UnknownMessageTile.js +++ b/src/skins/vector/views/molecules/UnknownMessageTile.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var UnknownMessageTileController = require("../../../../src/controllers/molecules/UnknownMessageTile"); +var UnknownMessageTileController = require('matrix-react-sdk/lib/controllers/molecules/UnknownMessageTile') module.exports = React.createClass({ displayName: 'UnknownMessageTile', diff --git a/src/skins/vector/views/molecules/UserSelector.js b/src/skins/vector/views/molecules/UserSelector.js index 8ec0086670..6b2336901f 100644 --- a/src/skins/vector/views/molecules/UserSelector.js +++ b/src/skins/vector/views/molecules/UserSelector.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var UserSelectorController = require("../../../../src/controllers/molecules/UserSelector"); +var UserSelectorController = require('matrix-react-sdk/lib/controllers/molecules/UserSelector') module.exports = React.createClass({ displayName: 'UserSelector', diff --git a/src/skins/vector/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js index 3642e6b58b..6957c6d8e5 100644 --- a/src/skins/vector/views/molecules/voip/CallView.js +++ b/src/skins/vector/views/molecules/voip/CallView.js @@ -38,4 +38,4 @@ module.exports = React.createClass({ ); } -}); \ No newline at end of file +}); diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js index 19ad17a7a7..0917aabde2 100644 --- a/src/skins/vector/views/molecules/voip/VideoView.js +++ b/src/skins/vector/views/molecules/voip/VideoView.js @@ -20,7 +20,7 @@ var React = require('react'); var MatrixClientPeg = require("../../../../../src/MatrixClientPeg"); var ComponentBroker = require('../../../../../src/ComponentBroker'); -var VideoViewController = require("../../../../../src/controllers/molecules/voip/VideoView"); +var VideoViewController = require('matrix-react-sdk/lib/controllers/molecules/voip/VideoView') var VideoFeed = ComponentBroker.get('atoms/voip/VideoFeed'); module.exports = React.createClass({ @@ -47,4 +47,4 @@ module.exports = React.createClass({ ); } -}); \ No newline at end of file +}); diff --git a/src/skins/vector/views/organisms/CreateRoom.js b/src/skins/vector/views/organisms/CreateRoom.js index b362db789b..3766404a16 100644 --- a/src/skins/vector/views/organisms/CreateRoom.js +++ b/src/skins/vector/views/organisms/CreateRoom.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var CreateRoomController = require("../../../../src/controllers/organisms/CreateRoom"); +var CreateRoomController = require('matrix-react-sdk/lib/controllers/organisms/CreateRoom') var ComponentBroker = require('../../../../src/ComponentBroker'); diff --git a/src/skins/vector/views/organisms/ErrorDialog.js b/src/skins/vector/views/organisms/ErrorDialog.js index 68d597cbb9..992ea05054 100644 --- a/src/skins/vector/views/organisms/ErrorDialog.js +++ b/src/skins/vector/views/organisms/ErrorDialog.js @@ -28,7 +28,7 @@ limitations under the License. */ var React = require('react'); -var ErrorDialogController = require("../../../../src/controllers/organisms/ErrorDialog"); +var ErrorDialogController = require('matrix-react-sdk/lib/controllers/organisms/ErrorDialog') module.exports = React.createClass({ displayName: 'ErrorDialog', diff --git a/src/skins/vector/views/organisms/LogoutPrompt.js b/src/skins/vector/views/organisms/LogoutPrompt.js index 10ed07ed8e..6e347a4ef7 100644 --- a/src/skins/vector/views/organisms/LogoutPrompt.js +++ b/src/skins/vector/views/organisms/LogoutPrompt.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); -var LogoutPromptController = require("../../../../src/controllers/organisms/LogoutPrompt"); +var LogoutPromptController = require('matrix-react-sdk/lib/controllers/organisms/LogoutPrompt') module.exports = React.createClass({ displayName: 'LogoutPrompt', diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index a9a3c782a9..861fd37077 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -19,7 +19,7 @@ limitations under the License. var React = require('react'); var classNames = require('classnames'); -var MemberListController = require("../../../../src/controllers/organisms/MemberList"); +var MemberListController = require('matrix-react-sdk/lib/controllers/organisms/MemberList') var ComponentBroker = require('../../../../src/ComponentBroker'); diff --git a/src/skins/vector/views/organisms/Notifier.js b/src/skins/vector/views/organisms/Notifier.js index 556d6b3a35..8ffc924f83 100644 --- a/src/skins/vector/views/organisms/Notifier.js +++ b/src/skins/vector/views/organisms/Notifier.js @@ -16,7 +16,7 @@ limitations under the License. 'use strict'; -var NotifierController = require("../../../../src/controllers/organisms/Notifier"); +var NotifierController = require('matrix-react-sdk/lib/controllers/organisms/Notifier') var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var TextForEvent = require("../../../../src/TextForEvent"); diff --git a/src/skins/vector/views/organisms/QuestionDialog.js b/src/skins/vector/views/organisms/QuestionDialog.js index cff9aa2f77..3941b1f925 100644 --- a/src/skins/vector/views/organisms/QuestionDialog.js +++ b/src/skins/vector/views/organisms/QuestionDialog.js @@ -28,7 +28,7 @@ limitations under the License. */ var React = require('react'); -var QuestionDialogController = require("../../../../src/controllers/organisms/QuestionDialog"); +var QuestionDialogController = require('matrix-react-sdk/lib/controllers/organisms/QuestionDialog') module.exports = React.createClass({ displayName: 'QuestionDialog', diff --git a/src/skins/vector/views/organisms/RoomList.js b/src/skins/vector/views/organisms/RoomList.js index a3d02066a4..4a75f7d5df 100644 --- a/src/skins/vector/views/organisms/RoomList.js +++ b/src/skins/vector/views/organisms/RoomList.js @@ -21,7 +21,7 @@ var ComponentBroker = require('../../../../src/ComponentBroker'); var CallView = ComponentBroker.get('molecules/voip/CallView'); var RoomDropTarget = ComponentBroker.get('molecules/RoomDropTarget'); -var RoomListController = require("../../../../src/controllers/organisms/RoomList"); +var RoomListController = require('matrix-react-sdk/lib/controllers/organisms/RoomList') module.exports = React.createClass({ displayName: 'RoomList', diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js index 520c1d6b0c..fabf739eb2 100644 --- a/src/skins/vector/views/organisms/RoomView.js +++ b/src/skins/vector/views/organisms/RoomView.js @@ -30,7 +30,7 @@ var RoomHeader = ComponentBroker.get('molecules/RoomHeader'); var MessageComposer = ComponentBroker.get('molecules/MessageComposer'); var CallView = ComponentBroker.get("molecules/voip/CallView"); var RoomSettings = ComponentBroker.get("molecules/RoomSettings"); -var RoomViewController = require("../../../../src/controllers/organisms/RoomView"); +var RoomViewController = require('matrix-react-sdk/lib/controllers/organisms/RoomView') var Loader = require("react-loader"); diff --git a/src/skins/vector/views/organisms/UserSettings.js b/src/skins/vector/views/organisms/UserSettings.js index 58a8248711..fcd085ee33 100644 --- a/src/skins/vector/views/organisms/UserSettings.js +++ b/src/skins/vector/views/organisms/UserSettings.js @@ -17,7 +17,7 @@ var React = require('react'); var ComponentBroker = require('../../../../src/ComponentBroker'); var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); -var UserSettingsController = require("../../../../src/controllers/organisms/UserSettings"); +var UserSettingsController = require('matrix-react-sdk/lib/controllers/organisms/UserSettings') var EditableText = ComponentBroker.get('atoms/EditableText'); var EnableNotificationsButton = ComponentBroker.get('atoms/EnableNotificationsButton'); diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js index 0fb627abe1..2ece7bc668 100644 --- a/src/skins/vector/views/pages/MatrixChat.js +++ b/src/skins/vector/views/pages/MatrixChat.js @@ -30,7 +30,7 @@ var RoomDirectory = ComponentBroker.get('organisms/RoomDirectory'); var MatrixToolbar = ComponentBroker.get('molecules/MatrixToolbar'); var Notifier = ComponentBroker.get('organisms/Notifier'); -var MatrixChatController = require('../../../../src/controllers/pages/MatrixChat'); +var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/MatrixChat') // should be atomised var Loader = require("react-loader"); diff --git a/src/skins/vector/views/templates/Login.js b/src/skins/vector/views/templates/Login.js index 4e13aabae8..e3d406c54e 100644 --- a/src/skins/vector/views/templates/Login.js +++ b/src/skins/vector/views/templates/Login.js @@ -24,7 +24,7 @@ var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var ProgressBar = ComponentBroker.get("molecules/ProgressBar"); var Loader = require("react-loader"); -var LoginController = require("../../../../src/controllers/templates/Login"); +var LoginController = require('matrix-react-sdk/lib/controllers/templates/Login') var ServerConfig = ComponentBroker.get("molecules/ServerConfig"); diff --git a/src/skins/vector/views/templates/Register.js b/src/skins/vector/views/templates/Register.js index 10d04c83be..087f332101 100644 --- a/src/skins/vector/views/templates/Register.js +++ b/src/skins/vector/views/templates/Register.js @@ -22,7 +22,7 @@ var ComponentBroker = require("../../../../src/ComponentBroker"); var Loader = require("react-loader"); -var RegisterController = require("../../../../src/controllers/templates/Register"); +var RegisterController = require('matrix-react-sdk/lib/controllers/templates/Register') var ServerConfig = ComponentBroker.get("molecules/ServerConfig");