diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js index 87c9f86aad..3ad7d97807 100644 --- a/src/skins/vector/skindex.js +++ b/src/skins/vector/skindex.js @@ -73,6 +73,7 @@ skin['voip.VideoFeed'] = require('matrix-react-sdk/lib/components/views/voip/Vid skin['dialogs.QuestionDialog'] = require('matrix-react-sdk/lib/components/views/dialogs/QuestionDialog'); skin['dialogs.ErrorDialog'] = require('matrix-react-sdk/lib/components/views/dialogs/ErrorDialog'); +skin['dialogs.LogoutPrompt'] = require('matrix-react-sdk/lib/components/views/dialogs/LogoutPrompt'); // Old style stuff @@ -87,7 +88,6 @@ 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.LogoutPrompt'] = require('./views/organisms/LogoutPrompt'); skin['organisms.RightPanel'] = require('./views/organisms/RightPanel'); skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory'); skin['organisms.RoomList'] = require('./views/organisms/RoomList'); diff --git a/src/skins/vector/views/organisms/LogoutPrompt.js b/src/skins/vector/views/organisms/LogoutPrompt.js deleted file mode 100644 index 6e347a4ef7..0000000000 --- a/src/skins/vector/views/organisms/LogoutPrompt.js +++ /dev/null @@ -1,41 +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'); - -var LogoutPromptController = require('matrix-react-sdk/lib/controllers/organisms/LogoutPrompt') - -module.exports = React.createClass({ - displayName: 'LogoutPrompt', - mixins: [LogoutPromptController], - - render: function() { - return ( -
-
- Sign out? -
-
- - -
-
- ); - }, -}); - diff --git a/src/skins/vector/views/organisms/UserSettings.js b/src/skins/vector/views/organisms/UserSettings.js index 091dfd259c..d99a391a35 100644 --- a/src/skins/vector/views/organisms/UserSettings.js +++ b/src/skins/vector/views/organisms/UserSettings.js @@ -53,7 +53,7 @@ module.exports = React.createClass({ }, onLogoutClicked: function(ev) { - var LogoutPrompt = sdk.getComponent('organisms.LogoutPrompt'); + var LogoutPrompt = sdk.getComponent('dialogs.LogoutPrompt'); this.logoutModal = Modal.createDialog(LogoutPrompt, {onCancel: this.onLogoutPromptCancel}); },