PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use the SettingsStore to get the theme

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-13 13:14:00 -07:00
parent 63bebe9dfd
commit d92cba25ef
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/login/Login.js
View file

@ -385,7 +385,7 @@ module.exports = React.createClass({
let header; let header;
// FIXME: remove status.im theme tweaks // FIXME: remove status.im theme tweaks
const theme = UserSettingsStore.getTheme(); const theme = SettingsStore.getValue("theme");
if (theme !== "status") { if (theme !== "status") {
header = <h2>{ _t('Sign in') }</h2>; header = <h2>{ _t('Sign in') }</h2>;
} }

4
src/components/structures/login/Registration.js
View file

@ -26,8 +26,8 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import RegistrationForm from '../../views/login/RegistrationForm'; import RegistrationForm from '../../views/login/RegistrationForm';
import RtsClient from '../../../RtsClient'; import RtsClient from '../../../RtsClient';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import UserSettingsStore from '../../../UserSettingsStore';
import SdkConfig from '../../../SdkConfig'; import SdkConfig from '../../../SdkConfig';
import SettingsStore from "../../../settings/SettingsStore";
const MIN_PASSWORD_LENGTH = 6; const MIN_PASSWORD_LENGTH = 6;
@ -329,7 +329,7 @@ module.exports = React.createClass({
const Spinner = sdk.getComponent("elements.Spinner"); const Spinner = sdk.getComponent("elements.Spinner");
const ServerConfig = sdk.getComponent('views.login.ServerConfig'); const ServerConfig = sdk.getComponent('views.login.ServerConfig');
const theme = UserSettingsStore.getTheme(); const theme = SettingsStore.getValue("theme");
let registerBody; let registerBody;
if (this.state.doingUIAuth) { if (this.state.doingUIAuth) {

4
src/components/views/login/LoginPage.js
View file

@ -16,7 +16,7 @@ limitations under the License.
'use strict'; 'use strict';
import UserSettingsStore from '../../../UserSettingsStore'; import SettingsStore from "../../../settings/SettingsStore";
const React = require('react'); const React = require('react');
@ -25,7 +25,7 @@ module.exports = React.createClass({
render: function() { render: function() {
// FIXME: this should be turned into a proper skin with a StatusLoginPage component // FIXME: this should be turned into a proper skin with a StatusLoginPage component
if (UserSettingsStore.getTheme() === 'status') { if (SettingsStore.getValue("theme") === 'status') {
return ( return (
<div className="mx_StatusLogin"> <div className="mx_StatusLogin">
<div className="mx_StatusLogin_brand"> <div className="mx_StatusLogin_brand">

4
src/components/views/login/RegistrationForm.js
View file

@ -22,8 +22,8 @@ import Email from '../../../email';
import { looksValid as phoneNumberLooksValid } from '../../../phonenumber'; import { looksValid as phoneNumberLooksValid } from '../../../phonenumber';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import UserSettingsStore from '../../../UserSettingsStore';
import SdkConfig from '../../../SdkConfig'; import SdkConfig from '../../../SdkConfig';
import SettingsStore from "../../../settings/SettingsStore";
const FIELD_EMAIL = 'field_email'; const FIELD_EMAIL = 'field_email';
const FIELD_PHONE_COUNTRY = 'field_phone_country'; const FIELD_PHONE_COUNTRY = 'field_phone_country';
@ -275,7 +275,7 @@ module.exports = React.createClass({
render: function() { render: function() {
const self = this; const self = this;
const theme = UserSettingsStore.getTheme(); const theme = SettingsStore.getValue("theme");
// FIXME: remove hardcoded Status team tweaks at some point // FIXME: remove hardcoded Status team tweaks at some point
const emailPlaceholder = theme === 'status' ? _t("Email address") : _t("Email address (optional)"); const emailPlaceholder = theme === 'status' ? _t("Email address") : _t("Email address (optional)");