mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-25 22:31:51 +02:00
Code Issues Projects Releases Wiki Activity

PR feedback from #355

Browse Source
This commit is contained in:
Kegan Dougal 2015-11-17 10:57:44 +00:00
parent af1e3373ea
commit 8602e0665d
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/skins/vector/views/pages/Login.js → src/components/login/Login.js
View File

@ -22,6 +22,7 @@ var sdk = require('matrix-react-sdk');
var Signup = require("matrix-react-sdk/lib/Signup"); var Signup = require("matrix-react-sdk/lib/Signup");
var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin"); var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin");
var CasLogin = require("matrix-react-sdk/lib/components/CasLogin"); var CasLogin = require("matrix-react-sdk/lib/components/CasLogin");
var ServerConfig = require("./ServerConfig");
/** /**
* A wire component which glues together login UI components and Signup logic * A wire component which glues together login UI components and Signup logic
@ -159,7 +160,6 @@ module.exports = React.createClass({displayName: 'Login',
render: function() { render: function() {
var Loader = sdk.getComponent("atoms.Spinner"); var Loader = sdk.getComponent("atoms.Spinner");
var loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null; var loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
var ServerConfig = sdk.getComponent("molecules.ServerConfig");
return ( return (
<div className="mx_Login"> <div className="mx_Login">

0
src/skins/vector/views/molecules/ServerConfig.js → src/components/login/ServerConfig.js
View File

2
src/skins/vector/skindex.js
View File

@ -64,7 +64,6 @@ skin['molecules.RoomTile'] = require('./views/molecules/RoomTile');
skin['molecules.RoomTooltip'] = require('./views/molecules/RoomTooltip'); skin['molecules.RoomTooltip'] = require('./views/molecules/RoomTooltip');
skin['molecules.SearchBar'] = require('./views/molecules/SearchBar'); skin['molecules.SearchBar'] = require('./views/molecules/SearchBar');
skin['molecules.SenderProfile'] = require('./views/molecules/SenderProfile'); skin['molecules.SenderProfile'] = require('./views/molecules/SenderProfile');
skin['molecules.ServerConfig'] = require('./views/molecules/ServerConfig');
skin['molecules.UnknownMessageTile'] = require('./views/molecules/UnknownMessageTile'); skin['molecules.UnknownMessageTile'] = require('./views/molecules/UnknownMessageTile');
skin['molecules.UserSelector'] = require('./views/molecules/UserSelector'); skin['molecules.UserSelector'] = require('./views/molecules/UserSelector');
skin['molecules.voip.CallView'] = require('./views/molecules/voip/CallView'); skin['molecules.voip.CallView'] = require('./views/molecules/voip/CallView');
@ -86,7 +85,6 @@ skin['organisms.UserSettings'] = require('./views/organisms/UserSettings');
skin['organisms.ViewSource'] = require('./views/organisms/ViewSource'); skin['organisms.ViewSource'] = require('./views/organisms/ViewSource');
skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage'); skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage');
skin['pages.MatrixChat'] = require('./views/pages/MatrixChat'); skin['pages.MatrixChat'] = require('./views/pages/MatrixChat');
skin['pages.Login'] = require('./views/pages/Login');
skin['templates.Register'] = require('./views/templates/Register'); skin['templates.Register'] = require('./views/templates/Register');
module.exports = skin; module.exports = skin;

2
src/skins/vector/views/pages/MatrixChat.js
View File

@ -167,7 +167,7 @@ module.exports = React.createClass({
/> />
); );
} else { } else {
var Login = sdk.getComponent("pages.Login"); var Login = require("../../../../components/login/Login");
return ( return (
<Login onLoggedIn={this.onLoggedIn} onRegisterClick={this.onRegisterClick} /> <Login onLoggedIn={this.onLoggedIn} onRegisterClick={this.onRegisterClick} />
); );

2
src/skins/vector/views/templates/Register.js
View File

@ -22,6 +22,7 @@ var sdk = require('matrix-react-sdk')
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg') var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg')
var RegisterController = require('../../../../controllers/templates/Register') var RegisterController = require('../../../../controllers/templates/Register')
var ServerConfig = require("../../../../components/login/ServerConfig");
var config = require('../../../../../config.json'); var config = require('../../../../../config.json');
@ -102,7 +103,6 @@ module.exports = React.createClass({
case 'initial': case 'initial':
var serverConfigStyle = {}; var serverConfigStyle = {};
serverConfigStyle.display = this.state.serverConfigVisible ? 'block' : 'none'; serverConfigStyle.display = this.state.serverConfigVisible ? 'block' : 'none';
var ServerConfig = sdk.getComponent("molecules.ServerConfig");
return ( return (
<div> <div>
<form onSubmit={this.onInitialStageSubmit}> <form onSubmit={this.onInitialStageSubmit}>