Move Spinner

This commit is contained in:
Kegan Dougal 2015-11-26 14:25:20 +00:00
parent ab22ca6a28
commit 3c12191cb7
14 changed files with 18 additions and 15 deletions

View file

@ -158,7 +158,7 @@ module.exports = React.createClass({displayName: 'Login',
},
render: function() {
var Loader = sdk.getComponent("atoms.Spinner");
var Loader = sdk.getComponent("elements.Spinner");
var loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
return (

View file

@ -207,7 +207,7 @@ module.exports = React.createClass({
}
var busySpinner;
if (this.state.busy) {
var Spinner = sdk.getComponent("atoms.Spinner");
var Spinner = sdk.getComponent("elements.Spinner");
busySpinner = (
<Spinner />
);

View file

@ -0,0 +1,34 @@
/*
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');
module.exports = React.createClass({
displayName: 'Spinner',
render: function() {
var w = this.props.w || 32;
var h = this.props.h || 32;
var imgClass = this.props.imgClassName || "";
return (
<div className="mx_Spinner">
<img src="img/spinner.gif" width={w} height={h} className={imgClass}/>
</div>
);
}
});