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

[DE SSE mobile] Correct encoding options

Browse source
This commit is contained in:
SergeyEzhin 2021-07-26 17:58:28 +03:00
parent 33bf343709
commit 735228e51d
6 changed files with 39 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/mobile/src/controller/Encoding.jsx
View file

@ -25,7 +25,7 @@ class EncodingController extends Component {
} }
initEncoding(type, advOptions, mode, formatOptions) { initEncoding(type, advOptions, mode, formatOptions) {
if(type === Asc.c_oAscAdvancedOptionsID.CSV) { if(type === Asc.c_oAscAdvancedOptionsID.TXT) {
Common.Notifications.trigger('preloader:close'); Common.Notifications.trigger('preloader:close');
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true); Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
@ -54,12 +54,7 @@ class EncodingController extends Component {
} }
closeModal() { closeModal() {
if (Device.phone) { f7.sheet.close('.encoding-popup', true);
f7.sheet.close('.encoding-popup', true);
} else {
f7.popover.close('#encoding-popover');
}
this.setState({isOpen: false}); this.setState({isOpen: false});
} }

3
apps/documenteditor/mobile/src/controller/settings/Download.jsx
View file

@ -30,11 +30,10 @@ class DownloadController extends Component {
(format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf, (format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf,
_t.notcriticalErrorTitle, _t.notcriticalErrorTitle,
() => { () => {
if (format == Asc.c_oAscFileType.TXT) { if (format === Asc.c_oAscFileType.TXT) {
const advOptions = api.asc_getAdvancedOptions(); const advOptions = api.asc_getAdvancedOptions();
this.closeModal(); this.closeModal();
Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format)); Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format));
} }
else { else {
this.closeModal(); this.closeModal();

48
apps/documenteditor/mobile/src/view/Encoding.jsx
View file

@ -5,7 +5,7 @@ import { Device } from '../../../../common/mobile/utils/device';
const PageEncoding = props => { const PageEncoding = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t("View.Settings", { returnObjects: true }); const _t = t("Settings", { returnObjects: true });
const pagesName = props.pagesName; const pagesName = props.pagesName;
const pages = props.pages; const pages = props.pages;
const [stateEncoding, setStateEncoding] = useState(props.valueEncoding); const [stateEncoding, setStateEncoding] = useState(props.valueEncoding);
@ -19,7 +19,7 @@ const PageEncoding = props => {
return ( return (
<View style={props.style} routes={routes}> <View style={props.style} routes={routes}>
<Page> <Page>
<Navbar title={_t.textChooseCsvOptions} /> <Navbar title={_t.textChooseTxtOptions} />
<BlockTitle>{_t.textEncoding}</BlockTitle> <BlockTitle>{_t.textEncoding}</BlockTitle>
<List> <List>
<ListItem title={nameEncoding} link="/encoding-list/" routeProps={{ <ListItem title={nameEncoding} link="/encoding-list/" routeProps={{
@ -43,14 +43,14 @@ const PageEncoding = props => {
const PageEncodingList = props => { const PageEncodingList = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t("View.Settings", { returnObjects: true }); const _t = t("Settings", { returnObjects: true });
const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding); const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding);
const pages = props.pages; const pages = props.pages;
const pagesName = props.pagesName; const pagesName = props.pagesName;
return ( return (
<Page> <Page>
<Navbar title={_t.txtDownloadCsv} backLink={_t.textBack} /> <Navbar title={_t.txtDownloadTxt} backLink={_t.textBack} />
<BlockTitle>{_t.textChooseEncoding}</BlockTitle> <BlockTitle>{_t.textChooseEncoding}</BlockTitle>
<List> <List>
{pagesName.map((name, index) => { {pagesName.map((name, index) => {
@ -73,32 +73,17 @@ class EncodingView extends Component {
} }
render() { render() {
const show_popover = this.props.usePopover;
return ( return (
show_popover ? <Popup className="encoding-popup" closeByBackdropClick={false}>
<Popover id="encoding-popover" className="popover__titled" closeByBackdropClick={false} closeByOutsideClick={false}> <PageEncoding
<PageEncoding onSaveFormat={this.props.onSaveFormat}
inPopover={true} closeModal={this.props.closeModal}
onSaveFormat={this.props.onSaveFormat} mode={this.props.mode}
closeModal={this.props.closeModal} pages={this.props.pages}
mode={this.props.mode} pagesName={this.props.pagesName}
pages={this.props.pages} valueEncoding={this.props.valueEncoding}
pagesName={this.props.pagesName} />
valueEncoding={this.props.valueEncoding} </Popup>
style={{height: '410px'}}
/>
</Popover> :
<Popup className="encoding-popup">
<PageEncoding
onSaveFormat={this.props.onSaveFormat}
closeModal={this.props.closeModal}
mode={this.props.mode}
pages={this.props.pages}
pagesName={this.props.pagesName}
valueEncoding={this.props.valueEncoding}
/>
</Popup>
) )
} }
} }
@ -112,9 +97,7 @@ const routes = [
const Encoding = props => { const Encoding = props => {
useEffect(() => { useEffect(() => {
if ( Device.phone ) f7.popup.open('.encoding-popup');
f7.popup.open('.encoding-popup');
else f7.popover.open('#encoding-popover', "#btn-settings");
return () => { return () => {
} }
@ -122,7 +105,6 @@ const Encoding = props => {
return ( return (
<EncodingView <EncodingView
usePopover={!Device.phone}
closeModal={props.closeModal} closeModal={props.closeModal}
onSaveFormat={props.onSaveFormat} onSaveFormat={props.onSaveFormat}
mode={props.mode} mode={props.mode}

7
apps/spreadsheeteditor/mobile/src/controller/Encoding.jsx
View file

@ -61,12 +61,7 @@ class EncodingController extends Component {
} }
closeModal() { closeModal() {
if (Device.phone) { f7.sheet.close('.encoding-popup', true);
f7.sheet.close('.encoding-popup', true);
} else {
f7.popover.close('#encoding-popover');
}
this.setState({isOpen: false}); this.setState({isOpen: false});
} }

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

@ -28,7 +28,7 @@ export class storeApplicationSettings {
unitMeasurement = Common.Utils.Metric.getCurrentMetric(); unitMeasurement = Common.Utils.Metric.getCurrentMetric();
macrosMode = 0; macrosMode = 0;
formulaLang = LocalStorage.getItem('sse-settings-func-lang') || dataLang[0].value; formulaLang = LocalStorage.getItem('sse-settings-func-lang') || this.getFormulaLanguages()[0].value;
regCode = undefined; regCode = undefined;
regExample = ''; regExample = '';
regData = []; regData = [];

49
apps/spreadsheeteditor/mobile/src/view/Encoding.jsx
View file

@ -116,38 +116,20 @@ class EncodingView extends Component {
} }
render() { render() {
const show_popover = this.props.usePopover;
return ( return (
show_popover ? <Popup className="encoding-popup" closeByBackdropClick={false}>
<Popover id="encoding-popover" className="popover__titled" closeByBackdropClick={false} closeByOutsideClick={false}> <PageEncoding
<PageEncoding onSaveFormat={this.props.onSaveFormat}
inPopover={true} closeModal={this.props.closeModal}
onSaveFormat={this.props.onSaveFormat} mode={this.props.mode}
closeModal={this.props.closeModal} pages={this.props.pages}
mode={this.props.mode} pagesName={this.props.pagesName}
pages={this.props.pages} namesDelimeter={this.props.namesDelimeter}
pagesName={this.props.pagesName} valueEncoding={this.props.valueEncoding}
namesDelimeter={this.props.namesDelimeter} valueDelimeter={this.props.valueDelimeter}
valueEncoding={this.props.valueEncoding} valuesDelimeter={this.props.valuesDelimeter}
valueDelimeter={this.props.valueDelimeter} />
valuesDelimeter={this.props.valuesDelimeter} </Popup>
style={{height: '410px'}}
/>
</Popover> :
<Popup className="encoding-popup">
<PageEncoding
onSaveFormat={this.props.onSaveFormat}
closeModal={this.props.closeModal}
mode={this.props.mode}
pages={this.props.pages}
pagesName={this.props.pagesName}
namesDelimeter={this.props.namesDelimeter}
valueEncoding={this.props.valueEncoding}
valueDelimeter={this.props.valueDelimeter}
valuesDelimeter={this.props.valuesDelimeter}
/>
</Popup>
) )
} }
} }
@ -165,9 +147,7 @@ const routes = [
const Encoding = props => { const Encoding = props => {
useEffect(() => { useEffect(() => {
if ( Device.phone ) f7.popup.open('.encoding-popup');
f7.popup.open('.encoding-popup');
else f7.popover.open('#encoding-popover', "#btn-settings");
return () => { return () => {
} }
@ -175,7 +155,6 @@ const Encoding = props => {
return ( return (
<EncodingView <EncodingView
usePopover={!Device.phone}
closeModal={props.closeModal} closeModal={props.closeModal}
onSaveFormat={props.onSaveFormat} onSaveFormat={props.onSaveFormat}
mode={props.mode} mode={props.mode}