switch initial spinner to mx_Spinner

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

View file

@ -0,0 +1,25 @@
/*
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.
*/
.mx_Spinner {
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
-webkit-justify-content: center;
align-items: center;
justify-content: center;
height: 100%;
}

View file

@ -26,7 +26,7 @@ module.exports = React.createClass({
var h = this.props.h || 32; var h = this.props.h || 32;
var imgClass = this.props.imgClassName || ""; var imgClass = this.props.imgClassName || "";
return ( return (
<div> <div className="mx_Spinner">
<img src="img/spinner.gif" width={w} height={h} className={imgClass}/> <img src="img/spinner.gif" width={w} height={h} className={imgClass}/>
</div> </div>
); );

View file

@ -23,9 +23,6 @@ var sdk = require('matrix-react-sdk')
var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/MatrixChat') 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 dis = require('matrix-react-sdk/lib/dispatcher');
var Matrix = require("matrix-js-sdk"); var Matrix = require("matrix-js-sdk");
var ContextualMenu = require("../../../../ContextualMenu"); var ContextualMenu = require("../../../../ContextualMenu");
@ -156,8 +153,9 @@ var MatrixChat = React.createClass({
); );
} }
} else if (this.state.logged_in) { } else if (this.state.logged_in) {
var Spinner = sdk.getComponent('atoms.Spinner');
return ( return (
<Loader /> <Spinner />
); );
} else if (this.state.screen == 'register') { } else if (this.state.screen == 'register') {
return ( return (