Linting. Finally set up my linter properly
This commit is contained in:
parent
66fd0f707f
commit
f1130ecba1
4 changed files with 29 additions and 28 deletions
|
@ -18,8 +18,8 @@ import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
export default class Slider extends React.Component {
|
export default class Slider extends React.Component {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
|
|
||||||
// A callback for the new value onclick
|
// A callback for the new value onclick
|
||||||
updateFontSize: PropTypes.func,
|
updateFontSize: PropTypes.func,
|
||||||
|
|
||||||
|
@ -32,24 +32,25 @@ export default class Slider extends React.Component {
|
||||||
|
|
||||||
// A function for formatting the the values
|
// A function for formatting the the values
|
||||||
displayFunc: PropTypes.func,
|
displayFunc: PropTypes.func,
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let dots = this.props.values.map(v =>
|
const dots = this.props.values.map(v =>
|
||||||
<Dot active={v<=this.props.value}
|
<Dot active={v<=this.props.value}
|
||||||
label={this.props.displayFunc(v)}
|
label={this.props.displayFunc(v)}
|
||||||
onClick={() => this.props.updateFontSize(v)}
|
onClick={() => this.props.updateFontSize(v)}
|
||||||
key={v}
|
key={v}
|
||||||
/>);
|
/>);
|
||||||
|
|
||||||
let offset = this.offset(this.props.values, this.props.value);
|
const offset = this.offset(this.props.values, this.props.value);
|
||||||
|
|
||||||
return <div className="mx_fontSlider">
|
return <div className="mx_fontSlider">
|
||||||
<div>
|
<div>
|
||||||
<div className="mx_fontSlider_bar">
|
<div className="mx_fontSlider_bar">
|
||||||
<hr />
|
<hr />
|
||||||
<div className="mx_fontSlider_selection">
|
<div className="mx_fontSlider_selection">
|
||||||
<div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%"}} />
|
<div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
|
||||||
<hr style={{width: offset + "%"}} />
|
<hr style={{width: offset + "%"}} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -57,7 +58,7 @@ export default class Slider extends React.Component {
|
||||||
{dots}
|
{dots}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
offset(values, value) {
|
offset(values, value) {
|
||||||
|
@ -66,7 +67,6 @@ export default class Slider extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
class Dot extends React.Component {
|
class Dot extends React.Component {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
// Callback for behaviour onclick
|
// Callback for behaviour onclick
|
||||||
onClick: PropTypes.func,
|
onClick: PropTypes.func,
|
||||||
|
@ -79,13 +79,13 @@ class Dot extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
|
const className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
|
||||||
|
|
||||||
return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
|
return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
|
||||||
<div className={className} />
|
<div className={className} />
|
||||||
<div>
|
<div>
|
||||||
{this.props.label}
|
{this.props.label}
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</span>;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -21,6 +21,8 @@ import * as sdk from "../../../../../index";
|
||||||
import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
|
import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
|
||||||
import Field from "../../../elements/Field";
|
import Field from "../../../elements/Field";
|
||||||
import FontSlider from "../../../../structures/FontSlider";
|
import FontSlider from "../../../../structures/FontSlider";
|
||||||
|
import AccessibleButton from "../../../elements/AccessibleButton";
|
||||||
|
import dis from "../../../../../dispatcher";
|
||||||
|
|
||||||
export default class StyleUserSettingsTab extends React.Component {
|
export default class StyleUserSettingsTab extends React.Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -31,7 +33,8 @@ export default class StyleUserSettingsTab extends React.Component {
|
||||||
...this._calculateThemeState(),
|
...this._calculateThemeState(),
|
||||||
customThemeUrl: "",
|
customThemeUrl: "",
|
||||||
customThemeMessage: {isError: false, text: ""},
|
customThemeMessage: {isError: false, text: ""},
|
||||||
}
|
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
_calculateThemeState() {
|
_calculateThemeState() {
|
||||||
|
@ -95,9 +98,9 @@ export default class StyleUserSettingsTab extends React.Component {
|
||||||
};
|
};
|
||||||
|
|
||||||
_onFontSizeChanged = (size) => {
|
_onFontSizeChanged = (size) => {
|
||||||
let parsed_size = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
|
const parsedSize = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
|
||||||
this.setState({fontSize: parsed_size})
|
this.setState({fontSize: parsedSize});
|
||||||
SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsed_size)
|
SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsedSize);
|
||||||
};
|
};
|
||||||
|
|
||||||
_onAddCustomTheme = async () => {
|
_onAddCustomTheme = async () => {
|
||||||
|
@ -235,7 +238,6 @@ export default class StyleUserSettingsTab extends React.Component {
|
||||||
id="font_size_field"
|
id="font_size_field"
|
||||||
onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
|
onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,9 +18,9 @@ import dis from './dispatcher';
|
||||||
import SettingsStore from './settings/SettingsStore';
|
import SettingsStore from './settings/SettingsStore';
|
||||||
|
|
||||||
export class FontWatcher {
|
export class FontWatcher {
|
||||||
constructor(min_size, max_size) {
|
constructor(minSize, maxSize) {
|
||||||
this._min_size = min_size;
|
this._min_size = minSize;
|
||||||
this._max_size = max_size;
|
this._max_size = maxSize;
|
||||||
this._dispatcherRef = null;
|
this._dispatcherRef = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ export class FontWatcher {
|
||||||
let fontSize = this._min_size < size?size:this._min_size;
|
let fontSize = this._min_size < size?size:this._min_size;
|
||||||
fontSize = fontSize < this._max_size?fontSize:this._max_size;
|
fontSize = fontSize < this._max_size?fontSize:this._max_size;
|
||||||
if (fontSize != size) {
|
if (fontSize != size) {
|
||||||
SettingsStore.setValue("font_size", null, fontSize)
|
SettingsStore.setValue("font_size", null, fontSize);
|
||||||
}
|
}
|
||||||
document.querySelector(":root").style.fontSize = fontSize + "px";
|
document.querySelector(":root").style.fontSize = fontSize + "px";
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,9 +18,8 @@ import SettingController from "./SettingController";
|
||||||
import dis from "../../dispatcher";
|
import dis from "../../dispatcher";
|
||||||
|
|
||||||
export default class FontSizeController extends SettingController {
|
export default class FontSizeController extends SettingController {
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super()
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
onChange(level, roomId, newValue) {
|
onChange(level, roomId, newValue) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue