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

Fixes, lints and i18n

Browse source
This commit is contained in:
Jorik Schellekens 2020-05-20 14:44:56 +01:00
parent 6d9d4ee547
commit 82b76192ae
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/FontWatcher.js
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import dis from './dispatcher'; import dis from './dispatcher/dispatcher';
import SettingsStore, {SettingLevel} from './settings/SettingsStore'; import SettingsStore, {SettingLevel} from './settings/SettingsStore';
export class FontWatcher { export class FontWatcher {
@ -42,7 +42,7 @@ export class FontWatcher {
}; };
_setRootFontSize = (size) => { _setRootFontSize = (size) => {
const fontSize = Math.max(Math.min(this.maxSize, size), this.minSize); const fontSize = Math.max(Math.min(FontWatcher.maxSize, size), FontWatcher.minSize);
if (fontSize != size) { if (fontSize != size) {
SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize); SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);

2
src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
View file

@ -24,7 +24,7 @@ import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
import Field from "../../../elements/Field"; import Field from "../../../elements/Field";
import Slider from "../../../elements/Slider"; import Slider from "../../../elements/Slider";
import AccessibleButton from "../../../elements/AccessibleButton"; import AccessibleButton from "../../../elements/AccessibleButton";
import dis from "../../../../../dispatcher"; import dis from "../../../../../dispatcher/dispatcher";
import { FontWatcher } from "../../../../../FontWatcher"; import { FontWatcher } from "../../../../../FontWatcher";
export default class AppearanceUserSettingsTab extends React.Component { export default class AppearanceUserSettingsTab extends React.Component {

2
src/i18n/strings/en_EN.json
View file

@ -412,8 +412,6 @@
"Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session", "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
"Show info about bridges in room settings": "Show info about bridges in room settings", "Show info about bridges in room settings": "Show info about bridges in room settings",
"Font size": "Font size", "Font size": "Font size",
"Min font size": "Min font size",
"Max font size": "Max font size",
"Custom font size": "Custom font size", "Custom font size": "Custom font size",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing", "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
"Use compact timeline layout": "Use compact timeline layout", "Use compact timeline layout": "Use compact timeline layout",

2
src/settings/controllers/FontSizeController.js
View file

@ -15,7 +15,7 @@ limitations under the License.
*/ */
import SettingController from "./SettingController"; import SettingController from "./SettingController";
import dis from "../../dispatcher"; import dis from "../../dispatcher/dispatcher";
export default class FontSizeController extends SettingController { export default class FontSizeController extends SettingController {
constructor() { constructor() {