imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch initial spinner to mx_Spinner

Browse source
This commit is contained in:
Matthew Hodgson 2015-11-07 20:16:44 +00:00
parent 4e170a2831
commit ed4c5b9f73
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/skins/vector/views/pages/MatrixChat.js
View file

@ -23,9 +23,6 @@ var sdk = require('matrix-react-sdk')
var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/MatrixChat')
// should be atomised
var Loader = require("react-loader");
var dis = require('matrix-react-sdk/lib/dispatcher');
var Matrix = require("matrix-js-sdk");
var ContextualMenu = require("../../../../ContextualMenu");
@ -156,8 +153,9 @@ var MatrixChat = React.createClass({
);
}
} else if (this.state.logged_in) {
var Spinner = sdk.getComponent('atoms.Spinner');
return (
<Loader />
<Spinner />
);
} else if (this.state.screen == 'register') {
return (
@ -175,4 +173,4 @@ var MatrixChat = React.createClass({
}
});
module.exports = DragDropContext(HTML5Backend)(MatrixChat);
module.exports = DragDropContext(HTML5Backend)(MatrixChat);