Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #941 from ONLYOFFICE/feature/bug-fixes

Browse source 
Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-06-23 17:23:57 +03:00 committed by GitHub
parent ea19e5ff27 b7d5babce1
commit 164e2c7815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/presentationeditor/mobile/src/controller/edit/EditText.jsx
View file

@ -134,11 +134,11 @@ class EditTextController extends Component {
let size = curSize; let size = curSize;
if (isDecrement) { if (isDecrement) {
typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size); typeof size === 'undefined' || size == '' ? api.FontSizeOut() : size = Math.max(1, --size);
} else { } else {
typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size); typeof size === 'undefined' || size == '' ? api.FontSizeIn() : size = Math.min(300, ++size);
} }
if (typeof size !== 'undefined') { if (typeof size !== 'undefined' || size == '') {
api.put_TextPrFontSize(size); api.put_TextPrFontSize(size);
} }
}; };

4
apps/presentationeditor/mobile/src/view/edit/EditText.jsx
View file

@ -15,7 +15,7 @@ const EditText = props => {
const fontName = storeTextSettings.fontName || _t.textFonts; const fontName = storeTextSettings.fontName || _t.textFonts;
const fontSize = storeTextSettings.fontSize; const fontSize = storeTextSettings.fontSize;
const fontColor = storeTextSettings.textColor; const fontColor = storeTextSettings.textColor;
const displaySize = typeof fontSize === 'undefined' ? _t.textAuto : fontSize + ' ' + _t.textPt; const displaySize = typeof fontSize === 'undefined' || fontSize == '' ? _t.textAuto : fontSize + ' ' + _t.textPt;
const isBold = storeTextSettings.isBold; const isBold = storeTextSettings.isBold;
const isItalic = storeTextSettings.isItalic; const isItalic = storeTextSettings.isItalic;
const isUnderline = storeTextSettings.isUnderline; const isUnderline = storeTextSettings.isUnderline;
@ -173,7 +173,7 @@ const PageFonts = props => {
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const storeTextSettings = props.storeTextSettings; const storeTextSettings = props.storeTextSettings;
const size = storeTextSettings.fontSize; const size = storeTextSettings.fontSize;
const displaySize = typeof size === 'undefined' ? _t.textAuto : size + ' ' + _t.textPt; const displaySize = typeof size === 'undefined' || size == '' ? _t.textAuto : size + ' ' + _t.textPt;
const curFontName = storeTextSettings.fontName; const curFontName = storeTextSettings.fontName;
const fonts = storeTextSettings.fontsArray; const fonts = storeTextSettings.fontsArray;

5
apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View file

@ -2,6 +2,7 @@ import React, { Component } from "react";
import { ApplicationSettings } from "../../view/settings/ApplicationSettings"; import { ApplicationSettings } from "../../view/settings/ApplicationSettings";
import {observer, inject} from "mobx-react"; import {observer, inject} from "mobx-react";
import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage'; import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
import {FunctionGroups} from '../../controller/add/AddFunction';
class ApplicationSettingsController extends Component { class ApplicationSettingsController extends Component {
constructor(props) { constructor(props) {
@ -16,11 +17,9 @@ class ApplicationSettingsController extends Component {
} }
initRegSettings() { initRegSettings() {
this.props.storeApplicationSettings.getRegCode();
const info = new Asc.asc_CFormatCellsInfo(); const info = new Asc.asc_CFormatCellsInfo();
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const regCode = this.props.storeApplicationSettings.regCode; const regCode = this.props.storeApplicationSettings.getRegCode();
info.asc_setType(Asc.c_oAscNumFormatType.None); info.asc_setType(Asc.c_oAscNumFormatType.None);
info.asc_setSymbol(regCode); info.asc_setSymbol(regCode);

7
apps/spreadsheeteditor/mobile/src/store/applicationSettings.js
View file

@ -1,4 +1,5 @@
import {makeObservable, action, observable} from 'mobx'; import {makeObservable, action, observable} from 'mobx';
import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage';
export class storeApplicationSettings { export class storeApplicationSettings {
constructor() { constructor() {
@ -27,7 +28,7 @@ export class storeApplicationSettings {
unitMeasurement = Common.Utils.Metric.getCurrentMetric(); unitMeasurement = Common.Utils.Metric.getCurrentMetric();
macrosMode = 0; macrosMode = 0;
formulaLang = Common.Locale.currentLang || dataLang[0].value; formulaLang = LocalStorage.getItem('sse-settings-func-lang') || dataLang[0].value;
regCode = undefined; regCode = undefined;
regExample = ''; regExample = '';
regData = []; regData = [];
@ -70,7 +71,7 @@ export class storeApplicationSettings {
getRegCode() { getRegCode() {
const regData = this.regData; const regData = this.regData;
let value = Number(Common.localStorage.getItem('sse-settings-regional')); let value = Number(LocalStorage.getItem('sse-settings-regional'));
regData.forEach(obj => { regData.forEach(obj => {
if(obj.code === value) { if(obj.code === value) {
@ -81,6 +82,8 @@ export class storeApplicationSettings {
if(!this.regCode) { if(!this.regCode) {
this.regCode = 0x0409; this.regCode = 0x0409;
} }
return this.regCode;
} }
changeRegCode(value) { changeRegCode(value) {

5
apps/spreadsheeteditor/mobile/src/store/textSettings.js
View file

@ -16,6 +16,7 @@ export class storeTextSettings {
paragraphValign: observable, paragraphValign: observable,
textIn: observable, textIn: observable,
initTextSettings: action, initTextSettings: action,
initFontSettings: action,
initEditorFonts: action, initEditorFonts: action,
initFontInfo: action, initFontInfo: action,
changeTextColor: action, changeTextColor: action,
@ -46,6 +47,10 @@ export class storeTextSettings {
default: this.textIn = 0; default: this.textIn = 0;
} }
this.initFontSettings(xfs);
}
initFontSettings(xfs) {
this.fontName = xfs.asc_getFontName(); this.fontName = xfs.asc_getFontName();
this.fontSize = xfs.asc_getFontSize(); this.fontSize = xfs.asc_getFontSize();